diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index 0779d2500b..111a5a8a17 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -184,7 +184,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   comboW->addItem(i18n("Keep Above/Below"));  
   comboW->addItem(i18n("Move to Previous/Next Desktop"));  
   comboW->addItem(i18n("Change Opacity"));  
-  comboW->addItem(i18n("Switch to Group Window to the Left/Right"));
+  comboW->addItem(i18n("Switch to Window Tab to the Left/Right"));
   comboW->addItem(i18n("Nothing"));  
   comboW->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
   connect(comboW, SIGNAL(activated(int)), SLOT(changed()));
@@ -481,7 +481,7 @@ const char* tbl_TiWAc[] = {
     "Above/Below",
     "Previous/Next Desktop",
     "Change Opacity",
-    "Switch to Group Window to the Left/Right",
+    "Switch to Window Tab to the Left/Right",
     "Nothing",
     "" };
 
@@ -492,7 +492,7 @@ const char* tbl_AllW[] = {
     "Above/Below",
     "Previous/Next Desktop",
     "Change Opacity",
-    "Switch to Group Window to the Left/Right",
+    "Switch to Window Tab to the Left/Right",
     "Nothing",
     "" };
 
@@ -578,7 +578,7 @@ void KTitleBarActionsConfig::load()
   setComboText(coTiAct1,cg.readEntry("CommandActiveTitlebar1","Raise").toAscii());
   setComboText(coTiAct2,cg.readEntry("CommandActiveTitlebar2","Start Window Tab Drag").toAscii());
   setComboText(coTiAct3,cg.readEntry("CommandActiveTitlebar3","Operations menu").toAscii());
-  setComboText(coTiAct4,cg.readEntry("CommandTitlebarWheel","Switch to Group Window to the Left/Right").toAscii());
+  setComboText(coTiAct4,cg.readEntry("CommandTitlebarWheel","Switch to Window Tab to the Left/Right").toAscii());
   setComboText(coTiInAct1,cg.readEntry("CommandInactiveTitlebar1","Activate and raise").toAscii());
   setComboText(coTiInAct2,cg.readEntry("CommandInactiveTitlebar2","Start Window Tab Drag").toAscii());
   setComboText(coTiInAct3,cg.readEntry("CommandInactiveTitlebar3","Operations menu").toAscii());
@@ -617,7 +617,7 @@ void KTitleBarActionsConfig::defaults()
   setComboText(coTiAct1,"Raise");
   setComboText(coTiAct2,"Start Window Tab Drag");
   setComboText(coTiAct3,"Operations menu");
-  setComboText(coTiAct4,"Switch to Group Window to the Left/Right");
+  setComboText(coTiAct4,"Switch to Window Tab to the Left/Right");
   setComboText(coTiInAct1,"Activate and raise");
   setComboText(coTiInAct2,"Start Window Tab Drag");
   setComboText(coTiInAct3,"Operations menu");
@@ -850,7 +850,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
   combo->addItem(i18n("Keep Above/Below"));  
   combo->addItem(i18n("Move to Previous/Next Desktop"));  
   combo->addItem(i18n("Change Opacity"));  
-  combo->addItem(i18n("Switch to Group Window to the Left/Right"));
+  combo->addItem(i18n("Switch to Window Tab to the Left/Right"));
   combo->addItem(i18n("Nothing"));  
   connect(combo, SIGNAL(activated(int)), SLOT(changed()));
   coAllW =  combo;
diff --git a/kwinbindings.cpp b/kwinbindings.cpp
index 01b55a0977..529e086c86 100644
--- a/kwinbindings.cpp
+++ b/kwinbindings.cpp
@@ -54,8 +54,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     a->setText( i18n("Navigation") );
     DEF( I18N_NOOP("Walk Through Windows"),                 Qt::ALT+Qt::Key_Tab, slotWalkThroughWindows() );
     DEF( I18N_NOOP("Walk Through Windows (Reverse)"),       Qt::ALT+Qt::SHIFT+Qt::Key_Backtab, slotWalkBackThroughWindows() );
-    DEF( I18N_NOOP("Walk Through Grouped Windows"),           0, slotSwitchToTabRight() );
-    DEF( I18N_NOOP("Walk Through Grouped Windows (Reverse)"), 0, slotSwitchToTabLeft() );
+    DEF( I18N_NOOP("Walk Through Window Tabs"),             0, slotSwitchToTabRight() );
+    DEF( I18N_NOOP("Walk Through Window Tabs (Reverse)"),   0, slotSwitchToTabLeft() );
     DEF( I18N_NOOP("Remove Window From Group"),             0, slotRemoveFromGroup() );
     DEF( I18N_NOOP("Walk Through Windows Alternative"),     0, slotWalkThroughWindowsAlternative() );
     DEF( I18N_NOOP("Walk Through Windows Alternative (Reverse)"), 0, slotWalkBackThroughWindowsAlternative() );
diff --git a/options.cpp b/options.cpp
index 6a9e852ce3..03b2acad0b 100644
--- a/options.cpp
+++ b/options.cpp
@@ -183,7 +183,7 @@ unsigned long Options::updateSettings()
     CmdInactiveTitlebar1 = mouseCommand(config.readEntry("CommandInactiveTitlebar1","Activate and raise"), true );
     CmdInactiveTitlebar2 = mouseCommand(config.readEntry("CommandInactiveTitlebar2","Start Window Tab Drag"), true );
     CmdInactiveTitlebar3 = mouseCommand(config.readEntry("CommandInactiveTitlebar3","Operations menu"), true );
-    CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel","Switch to Group Window to the Left/Right"));
+    CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel","Switch to Window Tab to the Left/Right"));
     CmdWindow1 = mouseCommand(config.readEntry("CommandWindow1","Activate, raise and pass click"), false );
     CmdWindow2 = mouseCommand(config.readEntry("CommandWindow2","Activate and pass click"), false );
     CmdWindow3 = mouseCommand(config.readEntry("CommandWindow3","Activate and pass click"), false );
@@ -343,8 +343,9 @@ Options::MouseWheelCommand Options::mouseWheelCommand(const QString &name)
     if (lowerName == "above/below") return MouseWheelAboveBelow;
     if (lowerName == "previous/next desktop") return MouseWheelPreviousNextDesktop;
     if (lowerName == "change opacity") return MouseWheelChangeOpacity;
-    if (lowerName == "switch to group window to the left/right") return MouseWheelChangeGroupWindow;
-    return MouseWheelNothing;
+    if (lowerName == "switch to window tab to the left/right") return MouseWheelChangeGroupWindow;
+    if (lowerName == "nothing") return MouseWheelNothing;
+    return MouseWheelChangeGroupWindow;
     }
 
 bool Options::showGeometryTip()
diff --git a/useractions.cpp b/useractions.cpp
index 5c4c47f6e9..61cec685ec 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -304,7 +304,7 @@ void Workspace::initSwitchToTab()
 
     QAction* action = switch_to_tab_popup->menuAction();
     popup->insertAction( mRemoveTabGroup, action );
-    action->setText( i18n("Switch to group window") );
+    action->setText( i18n("Switch to window tab") );
     }
 
 void Workspace::slotSwitchToTab( QAction* action )
@@ -533,7 +533,7 @@ void Workspace::readShortcuts()
         connect( kaction, SIGNAL(globalShortcutChanged(QKeySequence)), this, SLOT(slotWalkBackThroughWindowsKeyChanged(QKeySequence)));
         }
 
-    kaction = qobject_cast<KAction*>( keys->action("Walk Through Group Windows") );
+    kaction = qobject_cast<KAction*>( keys->action("Walk Through Window Tabs") );
     if( kaction != 0 )
         {
         cutWalkThroughGroupWindows = kaction->globalShortcut();
@@ -541,7 +541,7 @@ void Workspace::readShortcuts()
         SLOT( slotMoveToTabRightKeyChanged( QKeySequence ) ) );
         }
 
-    kaction = qobject_cast<KAction*>( keys->action("Walk Through Group Windows (Reverse)") );
+    kaction = qobject_cast<KAction*>( keys->action("Walk Through Window Tabs (Reverse)") );
     if( kaction != 0 )
         {
         cutWalkThroughGroupWindowsReverse = kaction->globalShortcut();