diff --git a/src/add-ons/input_server/filters/Jamfile b/src/add-ons/input_server/filters/Jamfile
index 222547b39d..02d1c33340 100644
--- a/src/add-ons/input_server/filters/Jamfile
+++ b/src/add-ons/input_server/filters/Jamfile
@@ -1,3 +1,3 @@
 SubDir HAIKU_TOP src add-ons input_server filters ;
 
-SubInclude HAIKU_TOP src add-ons input_server filters screensaver ;
\ No newline at end of file
+SubInclude HAIKU_TOP src add-ons input_server filters screen_saver ;
diff --git a/src/add-ons/input_server/filters/screensaver/Jamfile b/src/add-ons/input_server/filters/screen_saver/Jamfile
similarity index 80%
rename from src/add-ons/input_server/filters/screensaver/Jamfile
rename to src/add-ons/input_server/filters/screen_saver/Jamfile
index 8a3d1dfbee..fedfe33195 100644
--- a/src/add-ons/input_server/filters/screensaver/Jamfile
+++ b/src/add-ons/input_server/filters/screen_saver/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons input_server filters screensaver ;
+SubDir HAIKU_TOP src add-ons input_server filters screen_saver ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp b/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
similarity index 100%
rename from src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp
rename to src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
diff --git a/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h b/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.h
similarity index 100%
rename from src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h
rename to src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.h