diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in
index 12d51cefecb8..cc1946b3e2ee 100644
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -62,7 +62,7 @@ CPPSRCS += \
   nsVolume.cpp \
   nsVolumeService.cpp \
   nsVolumeStat.cpp \
-  TimeSetting.cpp \
+  TimeZoneSettingObserver.cpp \
   Volume.cpp \
   VolumeCommand.cpp \
   VolumeManager.cpp \
diff --git a/dom/system/gonk/SystemWorkerManager.cpp b/dom/system/gonk/SystemWorkerManager.cpp
index 9d4fe839b5ca..834efe7a1838 100644
--- a/dom/system/gonk/SystemWorkerManager.cpp
+++ b/dom/system/gonk/SystemWorkerManager.cpp
@@ -28,7 +28,7 @@
 #ifdef MOZ_WIDGET_GONK
 #include "mozilla/ipc/Netd.h"
 #include "AutoMounter.h"
-#include "TimeSetting.h"
+#include "TimeZoneSettingObserver.h"
 #endif
 #include "mozilla/ipc/Ril.h"
 #include "nsContentUtils.h"
diff --git a/dom/system/gonk/TimeSetting.cpp b/dom/system/gonk/TimeZoneSettingObserver.cpp
similarity index 99%
rename from dom/system/gonk/TimeSetting.cpp
rename to dom/system/gonk/TimeZoneSettingObserver.cpp
index c2696a4da85d..d1c9443362e0 100644
--- a/dom/system/gonk/TimeSetting.cpp
+++ b/dom/system/gonk/TimeZoneSettingObserver.cpp
@@ -18,7 +18,7 @@
 #include "nsJSUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
-#include "TimeSetting.h"
+#include "TimeZoneSettingObserver.h"
 #include "xpcpublic.h"
 
 #undef LOG
diff --git a/dom/system/gonk/TimeSetting.h b/dom/system/gonk/TimeZoneSettingObserver.h
similarity index 100%
rename from dom/system/gonk/TimeSetting.h
rename to dom/system/gonk/TimeZoneSettingObserver.h