diff --git a/headers/os/app/Message4.h b/headers/os/app/Message.h
similarity index 100%
rename from headers/os/app/Message4.h
rename to headers/os/app/Message.h
diff --git a/headers/private/app/MessagePrivate4.h b/headers/private/app/MessagePrivate.h
similarity index 100%
rename from headers/private/app/MessagePrivate4.h
rename to headers/private/app/MessagePrivate.h
diff --git a/headers/private/app/MessageUtils4.h b/headers/private/app/MessageUtils.h
similarity index 100%
rename from headers/private/app/MessageUtils4.h
rename to headers/private/app/MessageUtils.h
diff --git a/src/kits/app/Jamfile b/src/kits/app/Jamfile
index df366bc67a..0b18df7844 100644
--- a/src/kits/app/Jamfile
+++ b/src/kits/app/Jamfile
@@ -40,8 +40,6 @@ MergeObject <libbe>app_kit.o :
 	Looper.cpp
 	LooperList.cpp
 	Message.cpp
-	MessageBody.cpp
-	MessageField.cpp
 	MessageFilter.cpp
 	MessageQueue.cpp
 	MessageRunner.cpp
diff --git a/src/kits/app/Message4.cpp b/src/kits/app/Message.cpp
similarity index 100%
rename from src/kits/app/Message4.cpp
rename to src/kits/app/Message.cpp
diff --git a/src/kits/app/MessageUtils4.cpp b/src/kits/app/MessageUtils.cpp
similarity index 100%
rename from src/kits/app/MessageUtils4.cpp
rename to src/kits/app/MessageUtils.cpp