diff --git a/headers/private/app/ServerProtocol.h b/headers/private/app/ServerProtocol.h
index 1b8e10c08b..0b352ee425 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -245,7 +245,6 @@ enum {
 	AS_LAYER_HIDE,
 	AS_LAYER_MOVE,
 	AS_LAYER_RESIZE,
-	AS_LAYER_INVALIDATE,
 	AS_LAYER_DRAW,
 
 	AS_LAYER_GET_TOKEN,
@@ -302,8 +301,8 @@ enum {
 	AS_LAYER_END_PICTURE,
 	AS_LAYER_COPY_BITS,
 	AS_LAYER_DRAW_PICTURE,
-	AS_LAYER_INVAL_RECT,
-	AS_LAYER_INVAL_REGION,
+	AS_LAYER_INVALIDATE_RECT,
+	AS_LAYER_INVALIDATE_REGION,
 	AS_LAYER_INVERT_RECT,
 	AS_LAYER_MOVE_TO,
 	AS_LAYER_RESIZE_TO,
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index d8af710394..f2a53ee6b4 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -3214,7 +3214,7 @@ BView::Invalidate(BRect invalRect)
 
 	check_lock();
 
-	fOwner->fLink->StartMessage(AS_LAYER_INVAL_RECT);
+	fOwner->fLink->StartMessage(AS_LAYER_INVALIDATE_RECT);
 	fOwner->fLink->Attach<BRect>(invalRect);
 	fOwner->fLink->Flush();
 }
@@ -3231,7 +3231,7 @@ BView::Invalidate(const BRegion *invalRegion)
 	int32 count = 0;
 	count = const_cast<BRegion*>(invalRegion)->CountRects();
 
-	fOwner->fLink->StartMessage(AS_LAYER_INVAL_REGION);
+	fOwner->fLink->StartMessage(AS_LAYER_INVALIDATE_REGION);
 	fOwner->fLink->Attach<int32>(count);
 
 	for (int32 i = 0; i < count; i++)
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 762631abc2..8ae306c711 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -1486,10 +1486,10 @@ ServerWindow::_DispatchViewMessage(int32 code,
 			break;
 		}
 
-		case AS_LAYER_INVAL_RECT:
+		case AS_LAYER_INVALIDATE_RECT:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_INVAL_RECT: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
-			
+			DTRACE(("ServerWindow %s: Message AS_LAYER_INVALIDATE_RECT: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
+
 			// NOTE: looks like this call is NOT affected by origin and scale on R5
 			// so this implementation is "correct"
 			BRect invalidRect;
@@ -1499,18 +1499,18 @@ ServerWindow::_DispatchViewMessage(int32 code,
 			}
 			break;
 		}
-		case AS_LAYER_INVAL_REGION:
+		case AS_LAYER_INVALIDATE_REGION:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_INVAL_RECT: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
-			
+			DTRACE(("ServerWindow %s: Message AS_LAYER_INVALIDATE_RECT: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
+
 			// NOTE: looks like this call is NOT affected by origin and scale on R5
 			// so this implementation is "correct"
 			BRegion dirty;
 			int32 rectCount;
 			BRect rect;
-			
+
 			link.Read<int32>(&rectCount);
-			
+
 			for (int i = 0; i < rectCount; i++) {
 				link.Read<BRect>(&rect);
 				dirty.Include(rect);