diff --git a/rainbow/Gtk/Gtk.h b/rainbow/Gtk/Gtk.h
index 279ea4c0d..1f113cbbf 100644
--- a/rainbow/Gtk/Gtk.h
+++ b/rainbow/Gtk/Gtk.h
@@ -147,7 +147,7 @@ struct DrawDragRectInfo {
 #include <CtrlCore/stdids.h>
 #endif
 
-#define GUIPLATFORM_KEYCODES_INCLUDE <Gtk/Keys.h>
+#define GUIPLATFORM_KEYCODES_INCLUDE <Gtk/GtkKeys.h>
 
 //$	struct Ctrl::Top {
 #define GUIPLATFORM_CTRL_TOP_DECLS \
@@ -158,12 +158,12 @@ struct DrawDragRectInfo {
 	int                   id; \
 //$ }
 
-#define GUIPLATFORM_CTRL_DECLS_INCLUDE <Gtk/Ctrl.h>
+#define GUIPLATFORM_CTRL_DECLS_INCLUDE <Gtk/GtkCtrl.h>
 
 #define GUIPLATFORM_PASTECLIP_DECLS \
 int type; \
 
-#define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE <Gtk/Top.h>
+#define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE <Gtk/GtkTop.h>
 
 #define GUIPLATFORM_NOSCROLL
 
@@ -171,4 +171,4 @@ int rmsecs();
 
 END_UPP_NAMESPACE
 
-#define GUIPLATFORM_INCLUDE_AFTER <Gtk/After.h>
+#define GUIPLATFORM_INCLUDE_AFTER <Gtk/GtkAfter.h>
diff --git a/rainbow/Gtk/Gtk.upp b/rainbow/Gtk/Gtk.upp
index f7a05f540..ca4e2dcdc 100644
--- a/rainbow/Gtk/Gtk.upp
+++ b/rainbow/Gtk/Gtk.upp
@@ -2,22 +2,22 @@ description "Gtk backend\377";
 
 file
 	Gtk.h,
-	After.h,
-	Keys.h,
-	DrawOp.cpp,
-	DrawText.cpp,
-	DrawImage.cpp,
-	Util.cpp,
+	GtkAfter.h,
+	GtkKeys.h,
+	GtkDrawOp.cpp,
+	GtkDrawText.cpp,
+	GtkDrawImage.cpp,
+	GtkUtil.cpp,
 	GdkImage.cpp,
-	Ctrl.h,
-	Ctrl.cpp,
-	Wnd.cpp,
-	Create.cpp,
-	Capture.cpp,
-	Event.cpp,
-	App.cpp,
-	Top.h,
-	Top.cpp,
-	Clip.cpp,
-	DnD.cpp;
+	GtkCtrl.h,
+	GtkCtrl.cpp,
+	GtkWnd.cpp,
+	GtkCreate.cpp,
+	GtkCapture.cpp,
+	GtkEvent.cpp,
+	GtkApp.cpp,
+	GtkTop.h,
+	GtkTop.cpp,
+	GtkClip.cpp,
+	GtkDnD.cpp;
 
diff --git a/rainbow/Gtk/After.h b/rainbow/Gtk/GtkAfter.h
similarity index 100%
rename from rainbow/Gtk/After.h
rename to rainbow/Gtk/GtkAfter.h
diff --git a/rainbow/Gtk/App.cpp b/rainbow/Gtk/GtkApp.cpp
similarity index 100%
rename from rainbow/Gtk/App.cpp
rename to rainbow/Gtk/GtkApp.cpp
diff --git a/rainbow/Gtk/Capture.cpp b/rainbow/Gtk/GtkCapture.cpp
similarity index 100%
rename from rainbow/Gtk/Capture.cpp
rename to rainbow/Gtk/GtkCapture.cpp
diff --git a/rainbow/Gtk/Clip.cpp b/rainbow/Gtk/GtkClip.cpp
similarity index 100%
rename from rainbow/Gtk/Clip.cpp
rename to rainbow/Gtk/GtkClip.cpp
diff --git a/rainbow/Gtk/Create.cpp b/rainbow/Gtk/GtkCreate.cpp
similarity index 100%
rename from rainbow/Gtk/Create.cpp
rename to rainbow/Gtk/GtkCreate.cpp
diff --git a/rainbow/Gtk/Ctrl.cpp b/rainbow/Gtk/GtkCtrl.cpp
similarity index 100%
rename from rainbow/Gtk/Ctrl.cpp
rename to rainbow/Gtk/GtkCtrl.cpp
diff --git a/rainbow/Gtk/Ctrl.h b/rainbow/Gtk/GtkCtrl.h
similarity index 100%
rename from rainbow/Gtk/Ctrl.h
rename to rainbow/Gtk/GtkCtrl.h
diff --git a/rainbow/Gtk/DnD.cpp b/rainbow/Gtk/GtkDnD.cpp
similarity index 100%
rename from rainbow/Gtk/DnD.cpp
rename to rainbow/Gtk/GtkDnD.cpp
diff --git a/rainbow/Gtk/DrawImage.cpp b/rainbow/Gtk/GtkDrawImage.cpp
similarity index 100%
rename from rainbow/Gtk/DrawImage.cpp
rename to rainbow/Gtk/GtkDrawImage.cpp
diff --git a/rainbow/Gtk/DrawOp.cpp b/rainbow/Gtk/GtkDrawOp.cpp
similarity index 100%
rename from rainbow/Gtk/DrawOp.cpp
rename to rainbow/Gtk/GtkDrawOp.cpp
diff --git a/rainbow/Gtk/DrawText.cpp b/rainbow/Gtk/GtkDrawText.cpp
similarity index 100%
rename from rainbow/Gtk/DrawText.cpp
rename to rainbow/Gtk/GtkDrawText.cpp
diff --git a/rainbow/Gtk/Event.cpp b/rainbow/Gtk/GtkEvent.cpp
similarity index 100%
rename from rainbow/Gtk/Event.cpp
rename to rainbow/Gtk/GtkEvent.cpp
diff --git a/rainbow/Gtk/Keys.h b/rainbow/Gtk/GtkKeys.h
similarity index 100%
rename from rainbow/Gtk/Keys.h
rename to rainbow/Gtk/GtkKeys.h
diff --git a/rainbow/Gtk/Top.cpp b/rainbow/Gtk/GtkTop.cpp
similarity index 100%
rename from rainbow/Gtk/Top.cpp
rename to rainbow/Gtk/GtkTop.cpp
diff --git a/rainbow/Gtk/Top.h b/rainbow/Gtk/GtkTop.h
similarity index 100%
rename from rainbow/Gtk/Top.h
rename to rainbow/Gtk/GtkTop.h
diff --git a/rainbow/Gtk/Util.cpp b/rainbow/Gtk/GtkUtil.cpp
similarity index 100%
rename from rainbow/Gtk/Util.cpp
rename to rainbow/Gtk/GtkUtil.cpp
diff --git a/rainbow/Gtk/Wnd.cpp b/rainbow/Gtk/GtkWnd.cpp
similarity index 100%
rename from rainbow/Gtk/Wnd.cpp
rename to rainbow/Gtk/GtkWnd.cpp
diff --git a/rainbow/GtkMain/main.cpp b/rainbow/GtkMain/main.cpp
index f69302ded..b483d6dea 100644
--- a/rainbow/GtkMain/main.cpp
+++ b/rainbow/GtkMain/main.cpp
@@ -152,8 +152,6 @@ struct MyApp2 : TopWindow {
 		Title("Widget test");
 		Add(text.SizePos());
 		text <<= "Test\nHello World!";
-
-		DDUMP(Ctrl::GetWorkArea());
 	}
 };
 
@@ -240,7 +238,6 @@ struct MyApp4 : TopWindow {
 	
 	void DoFrameless()
 	{
-		DLOG("FRAMELESS");
 		FrameLess(!IsFrameLess());
 	}