diff --git a/Android.mk b/Android.mk
index ff12e59..8da8ede 100644
--- a/Android.mk
+++ b/Android.mk
@@ -288,7 +288,7 @@
     hardware_android.cc \
     image_properties_android.cc \
     libcurl_http_fetcher.cc \
-    metrics.cc \
+    metrics_reporter_omaha.cc \
     metrics_utils.cc \
     omaha_request_action.cc \
     omaha_request_params.cc \
diff --git a/fake_system_state.h b/fake_system_state.h
index 37f2233..990e227 100644
--- a/fake_system_state.h
+++ b/fake_system_state.h
@@ -27,7 +27,7 @@
 #include "update_engine/common/fake_hardware.h"
 #include "update_engine/common/mock_prefs.h"
 #include "update_engine/mock_connection_manager.h"
-#include "update_engine/mock_metrics.h"
+#include "update_engine/mock_metrics_reporter.h"
 #include "update_engine/mock_omaha_request_params.h"
 #include "update_engine/mock_p2p_manager.h"
 #include "update_engine/mock_payload_state.h"
diff --git a/metrics.cc b/metrics_reporter_omaha.cc
similarity index 100%
rename from metrics.cc
rename to metrics_reporter_omaha.cc
diff --git a/mock_metrics.h b/mock_metrics_reporter.h
similarity index 94%
rename from mock_metrics.h
rename to mock_metrics_reporter.h
index e456f61..60982a7 100644
--- a/mock_metrics.h
+++ b/mock_metrics_reporter.h
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef UPDATE_ENGINE_MOCK_METRICS_H
-#define UPDATE_ENGINE_MOCK_METRICS_H
+#ifndef UPDATE_ENGINE_MOCK_METRICS_REPORTER_H
+#define UPDATE_ENGINE_MOCK_METRICS_REPORTER_H
 
 #include <gmock/gmock.h>
 
@@ -78,4 +78,4 @@
 
 }  // namespace chromeos_update_engine
 
-#endif  // UPDATE_ENGINE_MOCK_METRICS_H
+#endif  // UPDATE_ENGINE_MOCK_METRICS_REPORTER_H
diff --git a/update_engine.gyp b/update_engine.gyp
index 467000e..32c6553 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -269,7 +269,7 @@
         'hardware_chromeos.cc',
         'image_properties_chromeos.cc',
         'libcurl_http_fetcher.cc',
-        'metrics.cc',
+        'metrics_reporter_omaha.cc',
         'metrics_utils.cc',
         'omaha_request_action.cc',
         'omaha_request_params.cc',