diff --git a/services/mediaanalytics/Android.bp b/services/mediametrics/Android.bp
similarity index 90%
rename from services/mediaanalytics/Android.bp
rename to services/mediametrics/Android.bp
index 2eaabe1..0840f31 100644
--- a/services/mediaanalytics/Android.bp
+++ b/services/mediametrics/Android.bp
@@ -11,7 +11,7 @@
     shared_libs: [
         "libbinder",
         "liblog",
-        "libmediaanalyticsservice",
+        "libmediametricsservice",
         "libutils",
     ],
 
@@ -27,12 +27,12 @@
 }
 
 cc_library_shared {
-    name: "libmediaanalyticsservice",
+    name: "libmediametricsservice",
 
     srcs: [
         "AudioAnalytics.cpp",
         "iface_statsd.cpp",
-        "MediaAnalyticsService.cpp",
+        "MediaMetricsService.cpp",
         "statsd_audiopolicy.cpp",
         "statsd_audiorecord.cpp",
         "statsd_audiothread.cpp",
diff --git a/services/mediaanalytics/AudioAnalytics.cpp b/services/mediametrics/AudioAnalytics.cpp
similarity index 100%
rename from services/mediaanalytics/AudioAnalytics.cpp
rename to services/mediametrics/AudioAnalytics.cpp
diff --git a/services/mediaanalytics/AudioAnalytics.h b/services/mediametrics/AudioAnalytics.h
similarity index 100%
rename from services/mediaanalytics/AudioAnalytics.h
rename to services/mediametrics/AudioAnalytics.h
diff --git a/services/mediaanalytics/MediaAnalyticsService.cpp b/services/mediametrics/MediaMetricsService.cpp
similarity index 99%
rename from services/mediaanalytics/MediaAnalyticsService.cpp
rename to services/mediametrics/MediaMetricsService.cpp
index a131e1a..b735b81 100644
--- a/services/mediaanalytics/MediaAnalyticsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@@ -18,7 +18,7 @@
 #define LOG_TAG "MediaAnalyticsService"
 #include <utils/Log.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 
 #include <pwd.h> //getpwuid
 
diff --git a/services/mediaanalytics/MediaAnalyticsService.h b/services/mediametrics/MediaMetricsService.h
similarity index 100%
rename from services/mediaanalytics/MediaAnalyticsService.h
rename to services/mediametrics/MediaMetricsService.h
diff --git a/services/mediaanalytics/OWNERS b/services/mediametrics/OWNERS
similarity index 100%
rename from services/mediaanalytics/OWNERS
rename to services/mediametrics/OWNERS
diff --git a/services/mediaanalytics/TEST_MAPPING b/services/mediametrics/TEST_MAPPING
similarity index 100%
rename from services/mediaanalytics/TEST_MAPPING
rename to services/mediametrics/TEST_MAPPING
diff --git a/services/mediaanalytics/TimeMachine.h b/services/mediametrics/TimeMachine.h
similarity index 100%
rename from services/mediaanalytics/TimeMachine.h
rename to services/mediametrics/TimeMachine.h
diff --git a/services/mediaanalytics/TransactionLog.h b/services/mediametrics/TransactionLog.h
similarity index 100%
rename from services/mediaanalytics/TransactionLog.h
rename to services/mediametrics/TransactionLog.h
diff --git a/services/mediaanalytics/iface_statsd.cpp b/services/mediametrics/iface_statsd.cpp
similarity index 98%
rename from services/mediaanalytics/iface_statsd.cpp
rename to services/mediametrics/iface_statsd.cpp
index dccc76a..962cafe 100644
--- a/services/mediaanalytics/iface_statsd.cpp
+++ b/services/mediametrics/iface_statsd.cpp
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <pwd.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "iface_statsd.h"
 
 #include <statslog.h>
diff --git a/services/mediaanalytics/iface_statsd.h b/services/mediametrics/iface_statsd.h
similarity index 100%
rename from services/mediaanalytics/iface_statsd.h
rename to services/mediametrics/iface_statsd.h
diff --git a/services/mediaanalytics/main_mediametrics.cpp b/services/mediametrics/main_mediametrics.cpp
similarity index 97%
rename from services/mediaanalytics/main_mediametrics.cpp
rename to services/mediametrics/main_mediametrics.cpp
index 6833fe2..4b2a9fa 100644
--- a/services/mediaanalytics/main_mediametrics.cpp
+++ b/services/mediametrics/main_mediametrics.cpp
@@ -18,7 +18,7 @@
 //#define LOG_NDEBUG 0
 #include <utils/Log.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
diff --git a/services/mediaanalytics/mediametrics.rc b/services/mediametrics/mediametrics.rc
similarity index 100%
rename from services/mediaanalytics/mediametrics.rc
rename to services/mediametrics/mediametrics.rc
diff --git a/services/mediaanalytics/statsd_audiopolicy.cpp b/services/mediametrics/statsd_audiopolicy.cpp
similarity index 98%
rename from services/mediaanalytics/statsd_audiopolicy.cpp
rename to services/mediametrics/statsd_audiopolicy.cpp
index 4e17040..2f934f8 100644
--- a/services/mediaanalytics/statsd_audiopolicy.cpp
+++ b/services/mediametrics/statsd_audiopolicy.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_audiorecord.cpp b/services/mediametrics/statsd_audiorecord.cpp
similarity index 98%
rename from services/mediaanalytics/statsd_audiorecord.cpp
rename to services/mediametrics/statsd_audiorecord.cpp
index a102178..4e2829d 100644
--- a/services/mediaanalytics/statsd_audiorecord.cpp
+++ b/services/mediametrics/statsd_audiorecord.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_audiothread.cpp b/services/mediametrics/statsd_audiothread.cpp
similarity index 99%
rename from services/mediaanalytics/statsd_audiothread.cpp
rename to services/mediametrics/statsd_audiothread.cpp
index cf8cff2..a5bfcba 100644
--- a/services/mediaanalytics/statsd_audiothread.cpp
+++ b/services/mediametrics/statsd_audiothread.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_audiotrack.cpp b/services/mediametrics/statsd_audiotrack.cpp
similarity index 99%
rename from services/mediaanalytics/statsd_audiotrack.cpp
rename to services/mediametrics/statsd_audiotrack.cpp
index 35f11d6..9d76d43 100644
--- a/services/mediaanalytics/statsd_audiotrack.cpp
+++ b/services/mediametrics/statsd_audiotrack.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_codec.cpp b/services/mediametrics/statsd_codec.cpp
similarity index 99%
rename from services/mediaanalytics/statsd_codec.cpp
rename to services/mediametrics/statsd_codec.cpp
index 72e2c17..fde0bfa 100644
--- a/services/mediaanalytics/statsd_codec.cpp
+++ b/services/mediametrics/statsd_codec.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_drm.cpp b/services/mediametrics/statsd_drm.cpp
similarity index 98%
rename from services/mediaanalytics/statsd_drm.cpp
rename to services/mediametrics/statsd_drm.cpp
index 6903e76..78d0a22 100644
--- a/services/mediaanalytics/statsd_drm.cpp
+++ b/services/mediametrics/statsd_drm.cpp
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <pwd.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "iface_statsd.h"
 
 #include <statslog.h>
diff --git a/services/mediaanalytics/statsd_extractor.cpp b/services/mediametrics/statsd_extractor.cpp
similarity index 98%
rename from services/mediaanalytics/statsd_extractor.cpp
rename to services/mediametrics/statsd_extractor.cpp
index b5c692e..cc62241 100644
--- a/services/mediaanalytics/statsd_extractor.cpp
+++ b/services/mediametrics/statsd_extractor.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_nuplayer.cpp b/services/mediametrics/statsd_nuplayer.cpp
similarity index 99%
rename from services/mediaanalytics/statsd_nuplayer.cpp
rename to services/mediametrics/statsd_nuplayer.cpp
index 3390233..9db1e81 100644
--- a/services/mediaanalytics/statsd_nuplayer.cpp
+++ b/services/mediametrics/statsd_nuplayer.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/statsd_recorder.cpp b/services/mediametrics/statsd_recorder.cpp
similarity index 99%
rename from services/mediaanalytics/statsd_recorder.cpp
rename to services/mediametrics/statsd_recorder.cpp
index afb74da..972a221 100644
--- a/services/mediaanalytics/statsd_recorder.cpp
+++ b/services/mediametrics/statsd_recorder.cpp
@@ -31,7 +31,7 @@
 
 #include <statslog.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 #include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
 
diff --git a/services/mediaanalytics/tests/Android.bp b/services/mediametrics/tests/Android.bp
similarity index 80%
rename from services/mediaanalytics/tests/Android.bp
rename to services/mediametrics/tests/Android.bp
index a8a330c..9eb2d89 100644
--- a/services/mediaanalytics/tests/Android.bp
+++ b/services/mediametrics/tests/Android.bp
@@ -9,14 +9,14 @@
     ],
 
     include_dirs: [
-        "frameworks/av/services/mediaanalytics",
+        "frameworks/av/services/mediametrics",
     ],
 
     shared_libs: [
         "libbinder",
         "liblog",
-        "libmediaanalyticsservice",
         "libmediametrics",
+        "libmediametricsservice",
         "libutils",
     ],
 
diff --git a/services/mediaanalytics/tests/build_and_run_all_unit_tests.sh b/services/mediametrics/tests/build_and_run_all_unit_tests.sh
similarity index 100%
rename from services/mediaanalytics/tests/build_and_run_all_unit_tests.sh
rename to services/mediametrics/tests/build_and_run_all_unit_tests.sh
diff --git a/services/mediaanalytics/tests/mediametrics_tests.cpp b/services/mediametrics/tests/mediametrics_tests.cpp
similarity index 99%
rename from services/mediaanalytics/tests/mediametrics_tests.cpp
rename to services/mediametrics/tests/mediametrics_tests.cpp
index 89b5383..808da7b 100644
--- a/services/mediaanalytics/tests/mediametrics_tests.cpp
+++ b/services/mediametrics/tests/mediametrics_tests.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "mediametrics_tests"
 #include <utils/Log.h>
 
-#include "MediaAnalyticsService.h"
+#include "MediaMetricsService.h"
 
 #include <stdio.h>