diff --git a/src/servers/app/server/Decorator.cpp b/src/servers/app/server/Decorator.cpp
index 15f8ca289a..feb1d2c5e3 100644
--- a/src/servers/app/server/Decorator.cpp
+++ b/src/servers/app/server/Decorator.cpp
@@ -554,37 +554,37 @@ void Decorator::GetFootprint(BRegion *region)
 	\return The type of area clicked
 
 	Clicked is called whenever it has been determined that the window has received a 
-	mouse click. The default version returns CLICK_NONE. A subclass may use any or all
+	mouse click. The default version returns DEC_NONE. A subclass may use any or all
 	of them.
 	
 	Click type : Action taken by the server
 	
-	- \c CLICK_NONE : Do nothing
-	- \c CLICK_ZOOM : Handles the zoom button (setting states, etc)
-	- \c CLICK_CLOSE : Handles the close button (setting states, etc)
-	- \c CLICK_MINIMIZE : Handles the minimize button (setting states, etc)
-	- \c CLICK_TAB : Currently unused
-	- \c CLICK_DRAG : Moves the window to the front and prepares to move the window
-	- \c CLICK_MOVETOBACK : Moves the window to the back of the stack
-	- \c CLICK_MOVETOFRONT : Moves the window to the front of the stack
-	- \c CLICK_SLIDETAB : Initiates tab-sliding, including calling SlideTab()
+	- \c DEC_NONE : Do nothing
+	- \c DEC_ZOOM : Handles the zoom button (setting states, etc)
+	- \c DEC_CLOSE : Handles the close button (setting states, etc)
+	- \c DEC_MINIMIZE : Handles the minimize button (setting states, etc)
+	- \c DEC_TAB : Currently unused
+	- \c DEC_DRAG : Moves the window to the front and prepares to move the window
+	- \c DEC_MOVETOBACK : Moves the window to the back of the stack
+	- \c DEC_MOVETOFRONT : Moves the window to the front of the stack
+	- \c DEC_SLIDETAB : Initiates tab-sliding, including calling SlideTab()
 
-	- \c CLICK_RESIZE : Handle window resizing as appropriate
-	- \c CLICK_RESIZE_L
-	- \c CLICK_RESIZE_T
-	- \c CLICK_RESIZE_R
-	- \c CLICK_RESIZE_B
-	- \c CLICK_RESIZE_LT
-	- \c CLICK_RESIZE_RT
-	- \c CLICK_RESIZE_LB
-	- \c CLICK_RESIZE_RB
+	- \c DEC_RESIZE : Handle window resizing as appropriate
+	- \c DEC_RESIZE_L
+	- \c DEC_RESIZE_T
+	- \c DEC_RESIZE_R
+	- \c DEC_RESIZE_B
+	- \c DEC_RESIZE_LT
+	- \c DEC_RESIZE_RT
+	- \c DEC_RESIZE_LB
+	- \c DEC_RESIZE_RB
 
 	This function is required by all subclasses.
 	
 */
 click_type Decorator::Clicked(BPoint pt, int32 buttons, int32 modifiers)
 {
-	return CLICK_NONE;
+	return DEC_NONE;
 }
 
 //! Hook function called when the decorator changes focus
diff --git a/src/servers/app/server/DefaultDecorator.cpp b/src/servers/app/server/DefaultDecorator.cpp
index 69fd110785..0d2d125a12 100644
--- a/src/servers/app/server/DefaultDecorator.cpp
+++ b/src/servers/app/server/DefaultDecorator.cpp
@@ -135,21 +135,21 @@ click_type DefaultDecorator::Clicked(BPoint pt, int32 buttons, int32 modifiers)
 	// In checking for hit test stuff, we start with the smallest rectangles the user might
 	// be clicking on and gradually work our way out into larger rectangles.
 	if(_closerect.Contains(pt))
-		return CLICK_CLOSE;
+		return DEC_CLOSE;
 
 	if(_zoomrect.Contains(pt))
-		return CLICK_ZOOM;
+		return DEC_ZOOM;
 	
 	if(_resizerect.Contains(pt) && _look==B_DOCUMENT_WINDOW_LOOK)
-		return CLICK_RESIZE;
+		return DEC_RESIZE;
 
 	// Clicking in the tab?
 	if(_tabrect.Contains(pt))
 	{
 		// Here's part of our window management stuff
 		if(buttons==B_SECONDARY_MOUSE_BUTTON)
-			return CLICK_MOVETOBACK;
-		return CLICK_DRAG;
+			return DEC_MOVETOBACK;
+		return DEC_DRAG;
 	}
 
 	// We got this far, so user is clicking on the border?
@@ -159,13 +159,13 @@ click_type DefaultDecorator::Clicked(BPoint pt, int32 buttons, int32 modifiers)
 	if(brect.Contains(pt) && !clientrect.Contains(pt))
 	{
 		if(_resizerect.Contains(pt))
-			return CLICK_RESIZE;
+			return DEC_RESIZE;
 		
-		return CLICK_DRAG;
+		return DEC_DRAG;
 	}
 
 	// Guess user didn't click anything
-	return CLICK_NONE;
+	return DEC_NONE;
 }
 
 void DefaultDecorator::_DoLayout(void)