diff --git a/headers/private/app/ServerProtocol.h b/headers/private/app/ServerProtocol.h
index f8918592b8..d76b671a77 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -272,10 +272,10 @@ enum {
 	AS_LAYER_POP_STATE,
 	AS_LAYER_SET_SCALE,
 	AS_LAYER_GET_SCALE,
-	AS_LAYER_SET_DRAW_MODE,
-	AS_LAYER_GET_DRAW_MODE,
-	AS_LAYER_SET_BLEND_MODE,
-	AS_LAYER_GET_BLEND_MODE,
+	AS_LAYER_SET_DRAWING_MODE,
+	AS_LAYER_GET_DRAWING_MODE,
+	AS_LAYER_SET_BLENDING_MODE,
+	AS_LAYER_GET_BLENDING_MODE,
 	AS_LAYER_SET_PEN_LOC,
 	AS_LAYER_GET_PEN_LOC,
 	AS_LAYER_SET_PEN_SIZE,
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 35c7708cd8..ffb6ec6a13 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -1696,7 +1696,7 @@ BView::SetDrawingMode(drawing_mode mode)
 	if (fOwner) {
 		check_lock();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_DRAW_MODE);
+		fOwner->fLink->StartMessage(AS_LAYER_SET_DRAWING_MODE);
 		fOwner->fLink->Attach<int8>((int8)mode);
 
 		fState->valid_flags |= B_VIEW_DRAWING_MODE_BIT;
@@ -1713,7 +1713,7 @@ BView::DrawingMode() const
 	if (!fState->IsValid(B_VIEW_DRAWING_MODE_BIT) && fOwner) {
 		check_lock();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_DRAW_MODE);
+		fOwner->fLink->StartMessage(AS_LAYER_GET_DRAWING_MODE);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1741,7 +1741,7 @@ BView::SetBlendingMode(source_alpha sourceAlpha, alpha_function alphaFunction)
 	if (fOwner) {
 		check_lock();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_BLEND_MODE);
+		fOwner->fLink->StartMessage(AS_LAYER_SET_BLENDING_MODE);
 		fOwner->fLink->Attach<int8>((int8)sourceAlpha);
 		fOwner->fLink->Attach<int8>((int8)alphaFunction);
 
@@ -1762,7 +1762,7 @@ BView::GetBlendingMode(source_alpha *_sourceAlpha,
 	if (!fState->IsValid(B_VIEW_BLENDING_BIT) && fOwner) {
 		check_lock();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_BLEND_MODE);
+		fOwner->fLink->StartMessage(AS_LAYER_GET_BLENDING_MODE);
 
 		int32 code;
  		if (fOwner->fLink->FlushWithReply(code) == B_OK
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 8459fcdb82..8c29b14bbe 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -1410,7 +1410,7 @@ ServerWindow::_DispatchViewMessage(int32 code,
 			fLink.Flush();
 			break;
 
-		case AS_LAYER_SET_BLEND_MODE:
+		case AS_LAYER_SET_BLENDING_MODE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_BLEND_MODE: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			int8 srcAlpha, alphaFunc;
@@ -1423,7 +1423,7 @@ ServerWindow::_DispatchViewMessage(int32 code,
 
 			break;
 		}
-		case AS_LAYER_GET_BLEND_MODE:
+		case AS_LAYER_GET_BLENDING_MODE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_BLEND_MODE: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			fLink.StartMessage(B_OK);
@@ -1433,7 +1433,7 @@ ServerWindow::_DispatchViewMessage(int32 code,
 
 			break;
 		}
-		case AS_LAYER_SET_DRAW_MODE:
+		case AS_LAYER_SET_DRAWING_MODE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_DRAW_MODE: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			int8 drawingMode;
@@ -1444,7 +1444,7 @@ ServerWindow::_DispatchViewMessage(int32 code,
 			
 			break;
 		}
-		case AS_LAYER_GET_DRAW_MODE:
+		case AS_LAYER_GET_DRAWING_MODE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_DRAW_MODE: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			fLink.StartMessage(B_OK);