diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 640a6a0aa7..805eaf0d84 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -364,9 +364,9 @@ if (rtc_include_tests) {
   rtc_test("rtc_unittests") {
     testonly = true
     deps = [
-      "base:rtc_analytics_unittests",
       "base:rtc_base_approved_unittests",
       "base:rtc_base_unittests",
+      "base:rtc_numerics_unittests",
       "base:rtc_task_queue_unittests",
       "p2p:libstunprober_unittests",
       "p2p:rtc_p2p_unittests",
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index ba31c3be2c..7c4fcf0ab6 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -337,11 +337,11 @@ rtc_static_library("rtc_task_queue") {
   }
 }
 
-rtc_static_library("rtc_analytics") {
+rtc_static_library("rtc_numerics") {
   sources = [
-    "analytics/exp_filter.cc",
-    "analytics/exp_filter.h",
-    "analytics/percentile_filter.h",
+    "numerics/exp_filter.cc",
+    "numerics/exp_filter.h",
+    "numerics/percentile_filter.h",
   ]
   deps = [
     ":rtc_base_approved",
@@ -862,15 +862,15 @@ if (rtc_include_tests) {
     }
   }
 
-  rtc_source_set("rtc_analytics_unittests") {
+  rtc_source_set("rtc_numerics_unittests") {
     testonly = true
     sources = [
-      "analytics/exp_filter_unittest.cc",
-      "analytics/percentile_filter_unittest.cc",
+      "numerics/exp_filter_unittest.cc",
+      "numerics/percentile_filter_unittest.cc",
     ]
     deps = [
-      ":rtc_analytics",
       ":rtc_base_tests_main",
+      ":rtc_numerics",
     ]
   }
 
diff --git a/webrtc/base/analytics/exp_filter.cc b/webrtc/base/numerics/exp_filter.cc
similarity index 96%
rename from webrtc/base/analytics/exp_filter.cc
rename to webrtc/base/numerics/exp_filter.cc
index 48fe1ad97a..a4754a64b3 100644
--- a/webrtc/base/analytics/exp_filter.cc
+++ b/webrtc/base/numerics/exp_filter.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/analytics/exp_filter.h"
+#include "webrtc/base/numerics/exp_filter.h"
 
 #include <math.h>
 
diff --git a/webrtc/base/analytics/exp_filter.h b/webrtc/base/numerics/exp_filter.h
similarity index 82%
rename from webrtc/base/analytics/exp_filter.h
rename to webrtc/base/numerics/exp_filter.h
index e93de48963..2361702c36 100644
--- a/webrtc/base/analytics/exp_filter.h
+++ b/webrtc/base/numerics/exp_filter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ANALYTICS_EXP_FILTER_H_
-#define WEBRTC_BASE_ANALYTICS_EXP_FILTER_H_
+#ifndef WEBRTC_BASE_NUMERICS_EXP_FILTER_H_
+#define WEBRTC_BASE_NUMERICS_EXP_FILTER_H_
 
 namespace rtc {
 
@@ -20,8 +20,7 @@ class ExpFilter {
  public:
   static const float kValueUndefined;
 
-  explicit ExpFilter(float alpha, float max = kValueUndefined)
-      : max_(max) {
+  explicit ExpFilter(float alpha, float max = kValueUndefined) : max_(max) {
     Reset(alpha);
   }
 
@@ -40,10 +39,10 @@ class ExpFilter {
   void UpdateBase(float alpha);
 
  private:
-  float alpha_;  // Filter factor base.
+  float alpha_;     // Filter factor base.
   float filtered_;  // Current filter output.
   const float max_;
 };
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ANALYTICS_EXP_FILTER_H_
+#endif  // WEBRTC_BASE_NUMERICS_EXP_FILTER_H_
diff --git a/webrtc/base/analytics/exp_filter_unittest.cc b/webrtc/base/numerics/exp_filter_unittest.cc
similarity index 97%
rename from webrtc/base/analytics/exp_filter_unittest.cc
rename to webrtc/base/numerics/exp_filter_unittest.cc
index 48cb4cc329..fbe88e072d 100644
--- a/webrtc/base/analytics/exp_filter_unittest.cc
+++ b/webrtc/base/numerics/exp_filter_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <math.h>
 
-#include "webrtc/base/analytics/exp_filter.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/test/gtest.h"
 
 namespace rtc {
diff --git a/webrtc/base/analytics/percentile_filter.h b/webrtc/base/numerics/percentile_filter.h
similarity index 95%
rename from webrtc/base/analytics/percentile_filter.h
rename to webrtc/base/numerics/percentile_filter.h
index 7cfba5ad00..638857de51 100644
--- a/webrtc/base/analytics/percentile_filter.h
+++ b/webrtc/base/numerics/percentile_filter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ANALYTICS_PERCENTILE_FILTER_H_
-#define WEBRTC_BASE_ANALYTICS_PERCENTILE_FILTER_H_
+#ifndef WEBRTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
+#define WEBRTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@ T PercentileFilter<T>::GetPercentileValue() const {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_BASE_ANALYTICS_PERCENTILE_FILTER_H_
+#endif  // WEBRTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
diff --git a/webrtc/base/analytics/percentile_filter_unittest.cc b/webrtc/base/numerics/percentile_filter_unittest.cc
similarity index 98%
rename from webrtc/base/analytics/percentile_filter_unittest.cc
rename to webrtc/base/numerics/percentile_filter_unittest.cc
index 02b7d091cb..23e63ecdec 100644
--- a/webrtc/base/analytics/percentile_filter_unittest.cc
+++ b/webrtc/base/numerics/percentile_filter_unittest.cc
@@ -11,8 +11,8 @@
 #include <algorithm>
 #include <climits>
 
-#include "webrtc/base/analytics/percentile_filter.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/numerics/percentile_filter.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index c38cd4761f..3b852d32cf 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -837,8 +837,8 @@ rtc_static_library("webrtc_opus") {
     ":audio_encoder_interface",
     ":audio_network_adaptor",
     "../..:webrtc_common",
-    "../../base:rtc_analytics",
     "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
     "../../common_audio",
     "../../system_wrappers",
   ]
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
index 78591e1cb7..8e0254fe25 100644
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -13,9 +13,9 @@
 #include <algorithm>
 #include <iterator>
 
-#include "webrtc/base/analytics/exp_filter.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/common_types.h"
diff --git a/webrtc/modules/congestion_controller/BUILD.gn b/webrtc/modules/congestion_controller/BUILD.gn
index 1fd4e0bfda..16794a16fe 100644
--- a/webrtc/modules/congestion_controller/BUILD.gn
+++ b/webrtc/modules/congestion_controller/BUILD.gn
@@ -44,9 +44,9 @@ rtc_static_library("congestion_controller") {
 
   deps = [
     "../..:webrtc_common",
-    "../../base:rtc_analytics",
     "../../base:rtc_base",
     "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
     "../../system_wrappers",
     "../bitrate_controller",
     "../pacing",
diff --git a/webrtc/modules/congestion_controller/median_slope_estimator.h b/webrtc/modules/congestion_controller/median_slope_estimator.h
index 76bb60ac81..c36fdbeff0 100644
--- a/webrtc/modules/congestion_controller/median_slope_estimator.h
+++ b/webrtc/modules/congestion_controller/median_slope_estimator.h
@@ -16,8 +16,8 @@
 #include <list>
 #include <vector>
 
-#include "webrtc/base/analytics/percentile_filter.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/numerics/percentile_filter.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 7d50e87535..f70a314f92 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -93,9 +93,9 @@ rtc_static_library("video_coding") {
     ":webrtc_vp8",
     ":webrtc_vp9",
     "../..:webrtc_common",
-    "../../base:rtc_analytics",
     "../../base:rtc_base",
     "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
     "../../base:rtc_task_queue",
     "../../common_video",
     "../../system_wrappers",
@@ -135,8 +135,8 @@ rtc_static_library("video_coding_utility") {
 
   deps = [
     "../..:webrtc_common",
-    "../../base:rtc_analytics",
     "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
     "../../common_video",
     "../../system_wrappers",
   ]
diff --git a/webrtc/modules/video_coding/codec_timer.h b/webrtc/modules/video_coding/codec_timer.h
index 1fabeb246c..3fd081b7c8 100644
--- a/webrtc/modules/video_coding/codec_timer.h
+++ b/webrtc/modules/video_coding/codec_timer.h
@@ -13,7 +13,7 @@
 
 #include <queue>
 
-#include "webrtc/base/analytics/percentile_filter.h"
+#include "webrtc/base/numerics/percentile_filter.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/modules/video_coding/media_opt_util.h b/webrtc/modules/video_coding/media_opt_util.h
index bab1cbe4c3..7cb8ed2d89 100644
--- a/webrtc/modules/video_coding/media_opt_util.h
+++ b/webrtc/modules/video_coding/media_opt_util.h
@@ -16,7 +16,7 @@
 
 #include <memory>
 
-#include "webrtc/base/analytics/exp_filter.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/modules/video_coding/internal_defines.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/typedefs.h"
diff --git a/webrtc/modules/video_coding/utility/frame_dropper.h b/webrtc/modules/video_coding/utility/frame_dropper.h
index 468b41744a..71ff93dadb 100644
--- a/webrtc/modules/video_coding/utility/frame_dropper.h
+++ b/webrtc/modules/video_coding/utility/frame_dropper.h
@@ -13,7 +13,7 @@
 
 #include <cstddef>
 
-#include "webrtc/base/analytics/exp_filter.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 54464cf8d9..3b33be38a3 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -58,8 +58,8 @@ rtc_static_library("video") {
   deps = [
     "..:webrtc_common",
     "../api:transport_api",
-    "../base:rtc_analytics",
     "../base:rtc_base_approved",
+    "../base:rtc_numerics",
     "../base:rtc_task_queue",
     "../common_video",
     "../logging:rtc_event_log_api",
diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc
index ad81fcc085..f83b0f5ff2 100644
--- a/webrtc/video/overuse_frame_detector.cc
+++ b/webrtc/video/overuse_frame_detector.cc
@@ -18,9 +18,9 @@
 #include <map>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/analytics/exp_filter.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h
index 70219843b4..9fb489742c 100644
--- a/webrtc/video/overuse_frame_detector.h
+++ b/webrtc/video/overuse_frame_detector.h
@@ -14,8 +14,8 @@
 #include <list>
 #include <memory>
 
-#include "webrtc/base/analytics/exp_filter.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/sequenced_task_checker.h"
 #include "webrtc/base/task_queue.h"
diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h
index 68d17e4a7a..f4bb8055f5 100644
--- a/webrtc/video/send_statistics_proxy.h
+++ b/webrtc/video/send_statistics_proxy.h
@@ -16,8 +16,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/analytics/exp_filter.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/numerics/exp_filter.h"
 #include "webrtc/base/ratetracker.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"