diff --git a/src/add-ons/decorators/SATDecorator/StackAndTile.cpp b/src/add-ons/decorators/SATDecorator/StackAndTile.cpp
index e9f767e372..0f871f3bb2 100644
--- a/src/add-ons/decorators/SATDecorator/StackAndTile.cpp
+++ b/src/add-ons/decorators/SATDecorator/StackAndTile.cpp
@@ -41,7 +41,7 @@ StackAndTile::ListenerRegistered(Desktop* desktop)
 	WindowList& windows = desktop->AllWindows();
 	for (Window *window = windows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList))
-		AddWindow(window);
+		WindowAdded(window);
 }
 
 
@@ -58,7 +58,7 @@ StackAndTile::ListenerUnregistered()
 
 
 void
-StackAndTile::AddWindow(Window* window)
+StackAndTile::WindowAdded(Window* window)
 {
 	SATWindow* satWindow = new (std::nothrow)SATWindow(this, window);
 	if (!satWindow)
@@ -70,7 +70,7 @@ StackAndTile::AddWindow(Window* window)
 
 
 void
-StackAndTile::RemoveWindow(Window* window)
+StackAndTile::WindowRemoved(Window* window)
 {
 	STRACE_SAT("StackAndTile::WindowRemoved %s\n", window->Title());
 
@@ -86,7 +86,7 @@ StackAndTile::RemoveWindow(Window* window)
 
 
 void
-StackAndTile::KeyEvent(uint32 what, int32 key, int32 modifiers)
+StackAndTile::KeyPressed(uint32 what, int32 key, int32 modifiers)
 {
 	// switch to and from stacking and snapping mode
 	if (what == B_MODIFIERS_CHANGED) {
@@ -138,7 +138,7 @@ StackAndTile::MouseUp(Window* window, BMessage* message, const BPoint& where)
 
 
 void
-StackAndTile::MoveWindow(Window* window)
+StackAndTile::WindowMoved(Window* window)
 {
 	SATWindow* satWindow = GetSATWindow(window);
 	if (!satWindow)
@@ -152,14 +152,14 @@ StackAndTile::MoveWindow(Window* window)
 
 
 void
-StackAndTile::ResizeWindow(Window* window)
+StackAndTile::WindowResized(Window* window)
 {
-	MoveWindow(window);
+	WindowMoved(window);
 }
 
 
 void
-StackAndTile::ActivateWindow(Window* window)
+StackAndTile::WindowActitvated(Window* window)
 {
 	SATWindow*	satWindow = GetSATWindow(window);
 	if (!satWindow)
@@ -170,7 +170,7 @@ StackAndTile::ActivateWindow(Window* window)
 
 
 void
-StackAndTile::SendWindowBehind(Window* window, Window* behindOf)
+StackAndTile::WindowSentBehind(Window* window, Window* behindOf)
 {
 	SATWindow*	satWindow = GetSATWindow(window);
 	if (!satWindow)
@@ -191,7 +191,7 @@ StackAndTile::SendWindowBehind(Window* window, Window* behindOf)
 
 
 void
-StackAndTile::SetWindowWorkspaces(Window* window, uint32 workspaces)
+StackAndTile::WindowWorkspacesChanged(Window* window, uint32 workspaces)
 {
 	SATWindow*	satWindow = GetSATWindow(window);
 	if (!satWindow)
@@ -212,21 +212,7 @@ StackAndTile::SetWindowWorkspaces(Window* window, uint32 workspaces)
 
 
 void
-StackAndTile::ShowWindow(Window* window)
-{
-
-}
-
-
-void
-StackAndTile::HideWindow(Window* window)
-{
-
-}
-
-
-void
-StackAndTile::MinimizeWindow(Window* window, bool minimize)
+StackAndTile::WindowMinimized(Window* window, bool minimize)
 {
 	SATWindow*	satWindow = GetSATWindow(window);
 	if (!satWindow)
@@ -247,7 +233,7 @@ StackAndTile::MinimizeWindow(Window* window, bool minimize)
 
 
 void
-StackAndTile::SetWindowTabLocation(Window* window, float location)
+StackAndTile::WindowTabLocationChanged(Window* window, float location)
 {
 	SATWindow*	satWindow = GetSATWindow(window);
 	if (!satWindow)
diff --git a/src/add-ons/decorators/SATDecorator/StackAndTile.h b/src/add-ons/decorators/SATDecorator/StackAndTile.h
index 70151b4761..54adfd084a 100644
--- a/src/add-ons/decorators/SATDecorator/StackAndTile.h
+++ b/src/add-ons/decorators/SATDecorator/StackAndTile.h
@@ -44,10 +44,10 @@ public:
 	virtual void			ListenerRegistered(Desktop* desktop);
 	virtual	void			ListenerUnregistered();
 
-	virtual void			AddWindow(Window* window);
-	virtual void			RemoveWindow(Window* window);
+	virtual void			WindowAdded(Window* window);
+	virtual void			WindowRemoved(Window* window);
 	
-	virtual void			KeyEvent(uint32 what, int32 key,
+	virtual void			KeyPressed(uint32 what, int32 key,
 								int32 modifiers);
 	virtual void			MouseEvent(BMessage* message) {}
 	virtual void			MouseDown(Window* window, BMessage* message,
@@ -57,18 +57,15 @@ public:
 	virtual void			MouseMoved(Window* window, BMessage* message,
 									const BPoint& where) {}
 
-	virtual void			MoveWindow(Window* window);
-	virtual void			ResizeWindow(Window* window);
-	virtual void			ActivateWindow(Window* window);
-	virtual void			SendWindowBehind(Window* window,
-									Window* behindOf);
-	virtual void			SetWindowWorkspaces(Window* window,
+	virtual void			WindowMoved(Window* window);
+	virtual void			WindowResized(Window* window);
+	virtual void			WindowActitvated(Window* window);
+	virtual void			WindowSentBehind(Window* window, Window* behindOf);
+	virtual void			WindowWorkspacesChanged(Window* window,
 									uint32 workspaces);
-	virtual void			ShowWindow(Window* window);
-	virtual void			HideWindow(Window* window);
-	virtual void			MinimizeWindow(Window* window, bool minimize);
+	virtual void			WindowMinimized(Window* window, bool minimize);
 
-	virtual void			SetWindowTabLocation(Window* window,
+	virtual void			WindowTabLocationChanged(Window* window,
 								float location);
 
 	virtual bool			SetDecoratorSettings(Window* window,