diff --git a/src/preferences/locale/TimeFormatSettingsView.cpp b/src/preferences/locale/FormatSettingsView.cpp
similarity index 99%
rename from src/preferences/locale/TimeFormatSettingsView.cpp
rename to src/preferences/locale/FormatSettingsView.cpp
index 8f7149401e..6779b68835 100644
--- a/src/preferences/locale/TimeFormatSettingsView.cpp
+++ b/src/preferences/locale/FormatSettingsView.cpp
@@ -4,7 +4,7 @@
  */
 
 
-#include "TimeFormatSettingsView.h"
+#include "FormatSettingsView.h"
 #include "Locale.h"
 
 #include <Alert.h>
diff --git a/src/preferences/locale/TimeFormatSettingsView.h b/src/preferences/locale/FormatSettingsView.h
similarity index 95%
rename from src/preferences/locale/TimeFormatSettingsView.h
rename to src/preferences/locale/FormatSettingsView.h
index eb892cb8f1..03a7bf9d84 100644
--- a/src/preferences/locale/TimeFormatSettingsView.h
+++ b/src/preferences/locale/FormatSettingsView.h
@@ -2,8 +2,8 @@
  * Copyright 2009, Adrien Destugues, pulkomandy@gmail.com. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef TIME_FORMAT_SETTINGS_H
-#define TIME_FORMAT_SETTINGS_H
+#ifndef _FORMAT_SETTINGS_H
+#define _FORMAT_SETTINGS_H
 
 
 #include <Box.h>
@@ -92,4 +92,4 @@ private:
 };
 
 
-#endif	// TIME_FORMAT_SETTINGS_H
+#endif	// _FORMAT_SETTINGS_H
diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile
index dcb13555c9..b131105c80 100644
--- a/src/preferences/locale/Jamfile
+++ b/src/preferences/locale/Jamfile
@@ -8,7 +8,7 @@ local sources =
 	Locale.cpp
 	LocaleSettings.cpp
 	LocaleWindow.cpp
-	TimeFormatSettingsView.cpp
+	FormatSettingsView.cpp
 ;
 
 Preference Locale
@@ -22,5 +22,5 @@ DoCatalogs Locale : x-vnd.Haiku-Locale :
 	LanguageListView.cpp
 	Locale.cpp
 	LocaleWindow.cpp
-	TimeFormatSettingsView.cpp
+	FormatSettingsView.cpp
 ;
diff --git a/src/preferences/locale/LocaleWindow.cpp b/src/preferences/locale/LocaleWindow.cpp
index 68f7b97b69..6b96efdf7c 100644
--- a/src/preferences/locale/LocaleWindow.cpp
+++ b/src/preferences/locale/LocaleWindow.cpp
@@ -26,7 +26,7 @@
 #include <TabView.h>
 #include <UnicodeChar.h>
 
-#include "TimeFormatSettingsView.h"
+#include "FormatSettingsView.h"
 
 
 #undef B_TRANSLATE_CONTEXT