diff --git a/beos/Makefile.target b/beos/Makefile.target
index 9436e3d2c..964907ed3 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -84,18 +84,18 @@
 # ----------------------------------------------------------------------------
 
 # S_BEOS are sources purely for the BeOS build
-S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp		\
-	beos_filetype.cpp beos_font.cpp beos_gui.cpp beos_login.cpp	\
-	beos_options.cpp beos_plotters.cpp beos_save_complete.cpp	\
-	beos_scaffolding.cpp beos_search.cpp beos_schedule.cpp		\
-	beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp		\
-	beos_window.cpp system_colour.cpp
+S_BEOS := about.cpp bitmap.cpp fetch_rsrc.cpp		\
+	filetype.cpp font.cpp gui.cpp login.cpp	\
+	gui_options.cpp plotters.cpp save_complete.cpp	\
+	scaffolding.cpp search.cpp schedule.cpp		\
+	thumbnail.cpp treeview.cpp throbber.cpp		\
+	window.cpp system_colour.cpp
 S_BEOS := $(addprefix beos/,$(S_BEOS))
 
-RDEF_BEOS := beos_res.rdef
+RDEF_BEOS := res.rdef
 RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
 
-RDEF_IMP_BEOS := beos_res_import.rdef
+RDEF_IMP_BEOS := res_import.rdef
 RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
 
 RDEP_BEOS := \
diff --git a/beos/beos_about.cpp b/beos/about.cpp
similarity index 97%
rename from beos/beos_about.cpp
rename to beos/about.cpp
index 2d8aaff9f..e5d79df4d 100644
--- a/beos/beos_about.cpp
+++ b/beos/about.cpp
@@ -23,9 +23,9 @@
 extern "C" {
 #include "utils/log.h"
 }
-#include "beos/beos_about.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_window.h"
+#include "beos/about.h"
+#include "beos/scaffolding.h"
+#include "beos/window.h"
 
 #include <Alert.h>
 #include <ScrollView.h>
diff --git a/beos/beos_about.h b/beos/about.h
similarity index 100%
rename from beos/beos_about.h
rename to beos/about.h
diff --git a/beos/beos_bitmap.cpp b/beos/bitmap.cpp
similarity index 99%
rename from beos/beos_bitmap.cpp
rename to beos/bitmap.cpp
index 5df1fce38..fed692315 100644
--- a/beos/beos_bitmap.cpp
+++ b/beos/bitmap.cpp
@@ -37,9 +37,9 @@ extern "C" {
 #include "image/bitmap.h"
 #include "utils/log.h"
 }
-#include "beos/beos_bitmap.h"
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
+#include "beos/bitmap.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
 
 struct bitmap {
   BBitmap *primary;
diff --git a/beos/beos_bitmap.h b/beos/bitmap.h
similarity index 100%
rename from beos/beos_bitmap.h
rename to beos/bitmap.h
diff --git a/beos/beos_fetch_rsrc.cpp b/beos/fetch_rsrc.cpp
similarity index 99%
rename from beos/beos_fetch_rsrc.cpp
rename to beos/fetch_rsrc.cpp
index 15b2000a4..79dea4e76 100644
--- a/beos/beos_fetch_rsrc.cpp
+++ b/beos/fetch_rsrc.cpp
@@ -43,8 +43,8 @@ extern "C" {
 #include "utils/ring.h"
 #include "utils/base64.h"
 }
-#include "beos/beos_fetch_rsrc.h"
-#include "beos/beos_gui.h"
+#include "beos/fetch_rsrc.h"
+#include "beos/gui.h"
 
 #include <image.h>
 #include <Resources.h>
diff --git a/beos/beos_fetch_rsrc.h b/beos/fetch_rsrc.h
similarity index 97%
rename from beos/beos_fetch_rsrc.h
rename to beos/fetch_rsrc.h
index 0607dbd07..ce17670a4 100644
--- a/beos/beos_fetch_rsrc.h
+++ b/beos/fetch_rsrc.h
@@ -30,6 +30,6 @@ void fetch_rsrc_unregister(void);
 class BResources;
 BResources *get_app_resources();
 
-#include "beos_res.h"
+#include "beos/res.h"
 
 #endif
diff --git a/beos/beos_filetype.cpp b/beos/filetype.cpp
similarity index 99%
rename from beos/beos_filetype.cpp
rename to beos/filetype.cpp
index d8920902d..7975041ac 100644
--- a/beos/beos_filetype.cpp
+++ b/beos/filetype.cpp
@@ -37,7 +37,7 @@ extern "C" {
 #include "utils/utils.h"
 }
 
-#include "beos/beos_filetype.h"
+#include "beos/filetype.h"
 
 static struct {
 	const char *type;
diff --git a/beos/beos_filetype.h b/beos/filetype.h
similarity index 100%
rename from beos/beos_filetype.h
rename to beos/filetype.h
diff --git a/beos/beos_font.cpp b/beos/font.cpp
similarity index 99%
rename from beos/beos_font.cpp
rename to beos/font.cpp
index 5c7d1caf8..a7b1a0c96 100644
--- a/beos/beos_font.cpp
+++ b/beos/font.cpp
@@ -38,9 +38,9 @@ extern "C" {
 #include "desktop/options.h"
 }
 
-#include "beos/beos_gui.h"
-#include "beos/beos_font.h"
-#include "beos/beos_plotters.h"
+#include "beos/gui.h"
+#include "beos/font.h"
+#include "beos/plotters.h"
 
 static bool nsfont_width(const plot_font_style_t *fstyle,
 		const char *string, size_t length,
diff --git a/beos/beos_font.h b/beos/font.h
similarity index 100%
rename from beos/beos_font.h
rename to beos/font.h
diff --git a/beos/beos_gui.cpp b/beos/gui.cpp
similarity index 98%
rename from beos/beos_gui.cpp
rename to beos/gui.cpp
index a9cf3473c..0c3075006 100644
--- a/beos/beos_gui.cpp
+++ b/beos/gui.cpp
@@ -66,17 +66,17 @@ extern "C" {
 #include "utils/utils.h"
 }
 
-#include "beos/beos_gui.h"
+#include "beos/gui.h"
 
-#include "beos/beos_options.h"
-//#include "beos/beos_completion.h"
-#include "beos/beos_window.h"
-#include "beos/beos_throbber.h"
-#include "beos/beos_filetype.h"
-//#include "beos/beos_download.h"
-#include "beos/beos_schedule.h"
-#include "beos/beos_fetch_rsrc.h"
-#include "beos/beos_scaffolding.h"
+#include "beos/gui_options.h"
+//#include "beos/completion.h"
+#include "beos/window.h"
+#include "beos/throbber.h"
+#include "beos/filetype.h"
+//#include "beos/download.h"
+#include "beos/schedule.h"
+#include "beos/fetch_rsrc.h"
+#include "beos/scaffolding.h"
 
 
 static void *myrealloc(void *ptr, size_t len, void *pw);
diff --git a/beos/beos_gui.h b/beos/gui.h
similarity index 100%
rename from beos/beos_gui.h
rename to beos/gui.h
diff --git a/beos/beos_options.cpp b/beos/gui_options.cpp
similarity index 92%
rename from beos/beos_options.cpp
rename to beos/gui_options.cpp
index acef3dcc6..62e6640c3 100644
--- a/beos/beos_options.cpp
+++ b/beos/gui_options.cpp
@@ -25,9 +25,9 @@ extern "C" {
 #include "utils/log.h"
 #include "desktop/options.h"
 }
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_options.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
+#include "beos/gui_options.h"
 
 #include <View.h>
 #include <Window.h>
diff --git a/beos/beos_options.h b/beos/gui_options.h
similarity index 100%
rename from beos/beos_options.h
rename to beos/gui_options.h
diff --git a/beos/beos_login.cpp b/beos/login.cpp
similarity index 98%
rename from beos/beos_login.cpp
rename to beos/login.cpp
index c732cd398..32860de20 100644
--- a/beos/beos_login.cpp
+++ b/beos/login.cpp
@@ -37,9 +37,9 @@ extern "C" {
 #include "utils/url.h"
 #include "utils/utils.h"
 }
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_window.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
+#include "beos/window.h"
 
 class LoginAlert : public BAlert {
 public:
diff --git a/beos/beos_plotters.cpp b/beos/plotters.cpp
similarity index 99%
rename from beos/beos_plotters.cpp
rename to beos/plotters.cpp
index adc9588b3..186627783 100644
--- a/beos/beos_plotters.cpp
+++ b/beos/plotters.cpp
@@ -37,12 +37,12 @@ extern "C" {
 #include "utils/utils.h"
 #include "desktop/options.h"
 }
-#include "beos/beos_font.h"
-#include "beos/beos_gui.h"
-#include "beos/beos_plotters.h"
-//#include "beos/beos_scaffolding.h"
+#include "beos/font.h"
+#include "beos/gui.h"
+#include "beos/plotters.h"
+//#include "beos/scaffolding.h"
 //#include "beos/options.h"
-#include "beos/beos_bitmap.h"
+#include "beos/bitmap.h"
 
 #warning MAKE ME static
 /*static*/ BView *current_view;
diff --git a/beos/beos_plotters.h b/beos/plotters.h
similarity index 100%
rename from beos/beos_plotters.h
rename to beos/plotters.h
diff --git a/beos/beos_res.h b/beos/res.h
similarity index 100%
rename from beos/beos_res.h
rename to beos/res.h
diff --git a/beos/beos_res.rdef b/beos/res.rdef
similarity index 99%
rename from beos/beos_res.rdef
rename to beos/res.rdef
index 8cb8fd09f..b047bd02a 100644
--- a/beos/beos_res.rdef
+++ b/beos/res.rdef
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "beos_res.h"
+#include "res.h"
 
 /* throbber */
 resource(400, "throbber0.png") #'data' import "res/throbber/throbber0.png";
diff --git a/beos/beos_save_complete.cpp b/beos/save_complete.cpp
similarity index 100%
rename from beos/beos_save_complete.cpp
rename to beos/save_complete.cpp
diff --git a/beos/beos_scaffolding.cpp b/beos/scaffolding.cpp
similarity index 99%
rename from beos/beos_scaffolding.cpp
rename to beos/scaffolding.cpp
index 0ba2004d9..afe36bd8f 100644
--- a/beos/beos_scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -58,15 +58,15 @@ extern "C" {
 #include "utils/utils.h"
 #include "utils/log.h"
 }
-#include "beos/beos_gui.h"
-#include "beos/beos_plotters.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_options.h"
-//#include "beos/beos_completion.h"
-#include "beos/beos_throbber.h"
-#include "beos/beos_window.h"
-//#include "beos/beos_schedule.h"
-//#include "beos/beos_download.h"
+#include "beos/gui.h"
+#include "beos/plotters.h"
+#include "beos/scaffolding.h"
+#include "beos/gui_options.h"
+//#include "beos/completion.h"
+#include "beos/throbber.h"
+#include "beos/window.h"
+//#include "beos/schedule.h"
+//#include "beos/download.h"
 
 #define TOOLBAR_HEIGHT 32
 #define DRAGGER_WIDTH 8
diff --git a/beos/beos_scaffolding.h b/beos/scaffolding.h
similarity index 100%
rename from beos/beos_scaffolding.h
rename to beos/scaffolding.h
diff --git a/beos/beos_schedule.cpp b/beos/schedule.cpp
similarity index 100%
rename from beos/beos_schedule.cpp
rename to beos/schedule.cpp
diff --git a/beos/beos_schedule.h b/beos/schedule.h
similarity index 100%
rename from beos/beos_schedule.h
rename to beos/schedule.h
diff --git a/beos/beos_search.cpp b/beos/search.cpp
similarity index 100%
rename from beos/beos_search.cpp
rename to beos/search.cpp
diff --git a/beos/system_colour.cpp b/beos/system_colour.cpp
index 1d03b35e6..9c25d8f5e 100644
--- a/beos/system_colour.cpp
+++ b/beos/system_colour.cpp
@@ -39,7 +39,7 @@ extern "C" {
 
 }
 
-#include "beos/beos_gui.h"
+#include "beos/gui.h"
 
 
 #if !defined(__HAIKU__) && !defined(B_BEOS_VERSION_DANO)
diff --git a/beos/beos_throbber.cpp b/beos/throbber.cpp
similarity index 96%
rename from beos/beos_throbber.cpp
rename to beos/throbber.cpp
index 6b344068b..f7fb35306 100644
--- a/beos/beos_throbber.cpp
+++ b/beos/throbber.cpp
@@ -23,9 +23,9 @@
 extern "C" {
 #include "utils/log.h"
 }
-#include "beos/beos_throbber.h"
-#include "beos/beos_bitmap.h"
-#include "beos/beos_fetch_rsrc.h"
+#include "beos/throbber.h"
+#include "beos/bitmap.h"
+#include "beos/fetch_rsrc.h"
 
 #include <File.h>
 #include <Resources.h>
diff --git a/beos/beos_throbber.h b/beos/throbber.h
similarity index 100%
rename from beos/beos_throbber.h
rename to beos/throbber.h
diff --git a/beos/beos_thumbnail.cpp b/beos/thumbnail.cpp
similarity index 97%
rename from beos/beos_thumbnail.cpp
rename to beos/thumbnail.cpp
index bd8d74bb0..ea03d29d8 100644
--- a/beos/beos_thumbnail.cpp
+++ b/beos/thumbnail.cpp
@@ -39,9 +39,9 @@ extern "C" {
 #include "render/font.h"
 #include "utils/log.h"
 }
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_plotters.h"
-#include "beos/beos_bitmap.h"
+#include "beos/scaffolding.h"
+#include "beos/plotters.h"
+#include "beos/bitmap.h"
 
 // Zeta PRIVATE: in libzeta for now.
 extern status_t ScaleBitmap(const BBitmap& inBitmap, BBitmap& outBitmap);
diff --git a/beos/beos_treeview.cpp b/beos/treeview.cpp
similarity index 100%
rename from beos/beos_treeview.cpp
rename to beos/treeview.cpp
diff --git a/beos/beos_window.cpp b/beos/window.cpp
similarity index 99%
rename from beos/beos_window.cpp
rename to beos/window.cpp
index 9c608d50d..b0ead3e5c 100644
--- a/beos/beos_window.cpp
+++ b/beos/window.cpp
@@ -34,13 +34,13 @@ extern "C" {
 #include "utils/utf8.h"
 #include "utils/utils.h"
 }
-#include "beos/beos_about.h"
-#include "beos/beos_window.h"
-#include "beos/beos_font.h"
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_plotters.h"
-//#include "beos/beos_schedule.h"
+#include "beos/about.h"
+#include "beos/window.h"
+#include "beos/font.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
+#include "beos/plotters.h"
+//#include "beos/schedule.h"
 
 #include <AppDefs.h>
 #include <BeBuild.h>
diff --git a/beos/beos_window.h b/beos/window.h
similarity index 98%
rename from beos/beos_window.h
rename to beos/window.h
index 52b87cc11..fc8a4f832 100644
--- a/beos/beos_window.h
+++ b/beos/window.h
@@ -23,7 +23,7 @@ extern "C" {
 #include "desktop/gui.h"
 #include "desktop/browser.h"
 }
-#include "beos/beos_scaffolding.h"
+#include "beos/scaffolding.h"
 
 class NSBrowserFrameView : public BView {
 public: