diff --git a/activation.cpp b/activation.cpp
index 9785b9ac24..03988dda1d 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -261,7 +261,7 @@ void Workspace::setActiveClient( Client* c, allowed_t )
         static_cast<EffectsHandlerImpl*>(effects)->windowActivated( active_client ? active_client->effectWindow() : NULL );
 
     if( tilingEnabled() )
-        notifyWindowActivated( active_client );
+        notifyTilingWindowActivated( active_client );
     --set_active_client_recursion;
     }
 
diff --git a/client.cpp b/client.cpp
index 334c1b50ac..a415007d29 100644
--- a/client.cpp
+++ b/client.cpp
@@ -896,7 +896,7 @@ void Client::minimize( bool avoid_animation )
         static_cast<EffectsHandlerImpl*>(effects)->windowMinimized( effectWindow());
 
     // when tiling, request a rearrangement
-    workspace()->notifyWindowMinimizeToggled( this );
+    workspace()->notifyTilingWindowMinimizeToggled( this );
 
     // Update states of all other windows in this group
     if( clientGroup() )
@@ -919,7 +919,7 @@ void Client::unminimize( bool avoid_animation )
         static_cast<EffectsHandlerImpl*>( effects )->windowUnminimized( effectWindow() );
 
     // when tiling, request a rearrangement
-    workspace()->notifyWindowMinimizeToggled( this );
+    workspace()->notifyTilingWindowMinimizeToggled( this );
 
     // Update states of all other windows in this group
     if( clientGroup() )
diff --git a/geometry.cpp b/geometry.cpp
index b73bb5977a..12ac72fc8d 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2155,7 +2155,7 @@ void Client::move( int x, int y, ForceGeometry_t force )
     workspace()->checkActiveScreen( this );
     workspace()->updateStackingOrder();
     workspace()->checkUnredirect();
-    workspace()->notifyWindowMove( this, moveResizeGeom, initialMoveResizeGeom );
+    workspace()->notifyTilingWindowMove( this, moveResizeGeom, initialMoveResizeGeom );
     // client itself is not damaged
     const QRect deco_rect = decorationRect().translated( geom.x(), geom.y() );
     addWorkspaceRepaint( deco_rect_before_block );
@@ -2819,9 +2819,9 @@ void Client::finishMoveResize( bool cancel )
     if( workspace()->tilingEnabled() )
         {
         if( wasResize )
-            workspace()->notifyWindowResizeDone( this, moveResizeGeom, initialMoveResizeGeom, cancel );
+            workspace()->notifyTilingWindowResizeDone( this, moveResizeGeom, initialMoveResizeGeom, cancel );
         else if( wasMove )
-            workspace()->notifyWindowMoveDone( this, moveResizeGeom, initialMoveResizeGeom, cancel );
+            workspace()->notifyTilingWindowMoveDone( this, moveResizeGeom, initialMoveResizeGeom, cancel );
         }
     else
         {
@@ -3095,7 +3095,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
                 abort();
                 break;
             }
-        workspace()->notifyWindowResize( this, moveResizeGeom, initialMoveResizeGeom );
+        workspace()->notifyTilingWindowResize( this, moveResizeGeom, initialMoveResizeGeom );
         // adjust new size to snap to other windows/borders
         moveResizeGeom = workspace()->adjustClientSize( this, moveResizeGeom, mode );
 
@@ -3270,7 +3270,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
 
     if ( isMove() )
         {
-        workspace()->notifyWindowMove( this, moveResizeGeom, initialMoveResizeGeom );
+        workspace()->notifyTilingWindowMove( this, moveResizeGeom, initialMoveResizeGeom );
         workspace()->checkElectricBorder(globalPos, xTime());
     }
     }
diff --git a/tile.cpp b/tile.cpp
index a7df9f0797..7fbd7cbc56 100644
--- a/tile.cpp
+++ b/tile.cpp
@@ -96,7 +96,7 @@ void Tile::floatTile()
     restorePreviousGeometry();
 
     commit();
-    client()->workspace()->notifyWindowActivated( client() );
+    client()->workspace()->notifyTilingWindowActivated( client() );
     // TODO: notify layout manager
     }
 
diff --git a/tiling.cpp b/tiling.cpp
index fc469718c8..6bf33284cf 100644
--- a/tiling.cpp
+++ b/tiling.cpp
@@ -169,14 +169,14 @@ void Workspace::updateAllTiles()
 /*
  * Resize the neighbouring clients to close any gaps
  */
-void Workspace::notifyWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig )
+void Workspace::notifyTilingWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig )
     {
     if( tilingLayouts.value( c->desktop() ) == NULL )
         return;
     tilingLayouts[ c->desktop() ]->clientResized( c, moveResizeGeom, orig );
     }
 
-void Workspace::notifyWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig )
+void Workspace::notifyTilingWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig )
     {
     if( tilingLayouts.value( c->desktop() ) == NULL )
         {
@@ -187,23 +187,23 @@ void Workspace::notifyWindowMove( Client *c, const QRect &moveResizeGeom, const
     updateAllTiles();
     }
 
-void Workspace::notifyWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled )
+void Workspace::notifyTilingWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled )
     {
     if( canceled )
-        notifyWindowResize( c, orig, moveResizeGeom );
+        notifyTilingWindowResize( c, orig, moveResizeGeom );
     else
-        notifyWindowResize( c, moveResizeGeom, orig );
+        notifyTilingWindowResize( c, moveResizeGeom, orig );
     }
 
-void Workspace::notifyWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled )
+void Workspace::notifyTilingWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled )
     {
     if( canceled )
-        notifyWindowMove( c, orig, moveResizeGeom );
+        notifyTilingWindowMove( c, orig, moveResizeGeom );
     else
-        notifyWindowMove( c, moveResizeGeom, orig );
+        notifyTilingWindowMove( c, moveResizeGeom, orig );
     }
 
-void Workspace::notifyWindowDesktopChanged( Client *c, int old_desktop )
+void Workspace::notifyTilingWindowDesktopChanged( Client *c, int old_desktop )
     {
     if( c->desktop() < 1 || c->desktop() > numberOfDesktops() )
         return;
@@ -229,7 +229,7 @@ void Workspace::notifyWindowDesktopChanged( Client *c, int old_desktop )
 /*
  * Implements the 3 raising modes in Window Behaviour -> Advanced
  */
-void Workspace::notifyWindowActivated( Client *c )
+void Workspace::notifyTilingWindowActivated( Client *c )
     {
     if( c == NULL )
         return;
@@ -271,7 +271,7 @@ void Workspace::notifyWindowActivated( Client *c )
         }
     }
 
-void Workspace::notifyWindowMinimizeToggled( Client *c )
+void Workspace::notifyTilingWindowMinimizeToggled( Client *c )
     {
     if( tilingLayouts.value( c->desktop() ) )
         {
@@ -279,7 +279,7 @@ void Workspace::notifyWindowMinimizeToggled( Client *c )
         }
     }
 
-void Workspace::notifyWindowMaximized( Client *c, Options::WindowOperation op )
+void Workspace::notifyTilingWindowMaximized( Client *c, Options::WindowOperation op )
     {
     if( tilingLayouts.value( c->desktop() ) )
         {
@@ -394,42 +394,42 @@ void Workspace::moveTile( int d )
         }
     }
 
-void Workspace::slotLeft()
+void Workspace::slotFocusTileLeft()
     {
     focusTile( Tile::Left );
     }
 
-void Workspace::slotRight()
+void Workspace::slotFocusTileRight()
     {
     focusTile( Tile::Right );
     }
 
-void Workspace::slotTop()
+void Workspace::slotFocusTileTop()
     {
     focusTile( Tile::Top );
     }
 
-void Workspace::slotBottom()
+void Workspace::slotFocusTileBottom()
     {
     focusTile( Tile::Bottom );
     }
 
-void Workspace::slotMoveLeft()
+void Workspace::slotMoveTileLeft()
     {
     moveTile( Tile::Left );
     }
 
-void Workspace::slotMoveRight()
+void Workspace::slotMoveTileRight()
     {
     moveTile( Tile::Right );
     }
 
-void Workspace::slotMoveTop()
+void Workspace::slotMoveTileTop()
     {
     moveTile( Tile::Top );
     }
 
-void Workspace::slotMoveBottom()
+void Workspace::slotMoveTileBottom()
     {
     moveTile( Tile::Bottom );
     }
diff --git a/useractions.cpp b/useractions.cpp
index 6c4585bac7..0a6672e832 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -705,7 +705,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
              || op == Options::VMaximizeOp
              || op == Options::RestoreOp ) )
         {
-        notifyWindowMaximized( c, op );
+        notifyTilingWindowMaximized( c, op );
         }
 
     if (op == Options::MoveOp || op == Options::UnrestrictedMoveOp )
diff --git a/workspace.cpp b/workspace.cpp
index 820488fe0f..bdc7863a1b 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1158,7 +1158,7 @@ void Workspace::slotReconfigure()
           layout->reconfigureTiling();
         }
     // just so that we reset windows in the right manner, 'activate' the current active window
-    notifyWindowActivated( activeClient() );
+    notifyTilingWindowActivated( activeClient() );
     rootInfo->setSupported( NET::WM2FrameOverlap, mgr->factory()->supports( AbilityExtendIntoClientArea ) );
     }
 
@@ -1431,7 +1431,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
             movingClient->setDesktop( new_desktop );
             if( tilingEnabled() )
                 {
-                notifyWindowDesktopChanged( movingClient, old_desktop );
+                notifyTilingWindowDesktopChanged( movingClient, old_desktop );
                 }
             }
 
@@ -1621,7 +1621,7 @@ void Workspace::sendClientToDesktop( Client* c, int desk, bool dont_activate )
     else
         raiseClient( c );
 
-    notifyWindowDesktopChanged( c, old_desktop );
+    notifyTilingWindowDesktopChanged( c, old_desktop );
 
     ClientList transients_stacking_order = ensureStackingOrder( c->transients() );
     for( ClientList::ConstIterator it = transients_stacking_order.constBegin();
diff --git a/workspace.h b/workspace.h
index 53f76f66a2..65e6516286 100644
--- a/workspace.h
+++ b/workspace.h
@@ -186,14 +186,14 @@ class Workspace : public QObject, public KDecorationDefines
         // various points in existing code so that
         // tiling can take any action if required.
         // They are defined in tiling.cpp
-        void notifyWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig );
-        void notifyWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig );
-        void notifyWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled );
-        void notifyWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled );
-        void notifyWindowDesktopChanged( Client *c, int old_desktop );
-        void notifyWindowActivated( Client *c );
-        void notifyWindowMinimizeToggled( Client *c );
-        void notifyWindowMaximized( Client *c, WindowOperation op );
+        void notifyTilingWindowResize( Client *c, const QRect &moveResizeGeom, const QRect &orig );
+        void notifyTilingWindowMove( Client *c, const QRect &moveResizeGeom, const QRect &orig );
+        void notifyTilingWindowResizeDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled );
+        void notifyTilingWindowMoveDone( Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled );
+        void notifyTilingWindowDesktopChanged( Client *c, int old_desktop );
+        void notifyTilingWindowActivated( Client *c );
+        void notifyTilingWindowMinimizeToggled( Client *c );
+        void notifyTilingWindowMaximized( Client *c, WindowOperation op );
 
         Position supportedTilingResizeMode( Client *c, Position currentMode );
 
@@ -698,15 +698,15 @@ class Workspace : public QObject, public KDecorationDefines
         void slotPreviousTileLayout();
 
         // Changes the focused client
-        void slotLeft();
-        void slotRight();
-        void slotTop();
-        void slotBottom();
+        void slotFocusTileLeft();
+        void slotFocusTileRight();
+        void slotFocusTileTop();
+        void slotFocusTileBottom();
         // swaps active and adjacent client.
-        void slotMoveLeft();
-        void slotMoveRight();
-        void slotMoveTop();
-        void slotMoveBottom();
+        void slotMoveTileLeft();
+        void slotMoveTileRight();
+        void slotMoveTileTop();
+        void slotMoveTileBottom();
         void belowCursor();
         
         // NOTE: debug method