diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h
index 5815996b57..5eae219772 100644
--- a/webrtc/modules/interface/module_common_types.h
+++ b/webrtc/modules/interface/module_common_types.h
@@ -323,11 +323,11 @@ struct FecProtectionParams {
 // Interface used by the CallStats class to distribute call statistics.
 // Callbacks will be triggered as soon as the class has been registered to a
 // CallStats object using RegisterStatsObserver.
-class StatsObserver {
+class CallStatsObserver {
  public:
   virtual void OnRttUpdate(uint32_t rtt_ms) = 0;
 
-  virtual ~StatsObserver() {}
+  virtual ~CallStatsObserver() {}
 };
 
 // class describing a complete, or parts of an encoded frame.
diff --git a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
index 0a1a92cb48..fa1129f272 100644
--- a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
+++ b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
@@ -37,7 +37,7 @@ class RemoteBitrateObserver {
   virtual ~RemoteBitrateObserver() {}
 };
 
-class RemoteBitrateEstimator : public StatsObserver, public Module {
+class RemoteBitrateEstimator : public CallStatsObserver, public Module {
  public:
   enum EstimationMode {
     kMultiStreamEstimation,
diff --git a/webrtc/video_engine/call_stats.cc b/webrtc/video_engine/call_stats.cc
index d9f2243ff1..233d536ab5 100644
--- a/webrtc/video_engine/call_stats.cc
+++ b/webrtc/video_engine/call_stats.cc
@@ -76,7 +76,7 @@ int32_t CallStats::Process() {
 
   // If there is a valid rtt, update all observers.
   if (max_rtt > 0) {
-    for (std::list<StatsObserver*>::iterator it = observers_.begin();
+    for (std::list<CallStatsObserver*>::iterator it = observers_.begin();
          it != observers_.end(); ++it) {
       (*it)->OnRttUpdate(max_rtt);
     }
@@ -89,9 +89,9 @@ RtcpRttObserver* CallStats::rtcp_rtt_observer() const {
   return rtcp_rtt_observer_.get();
 }
 
-void CallStats::RegisterStatsObserver(StatsObserver* observer) {
+void CallStats::RegisterStatsObserver(CallStatsObserver* observer) {
   CriticalSectionScoped cs(crit_.get());
-  for (std::list<StatsObserver*>::iterator it = observers_.begin();
+  for (std::list<CallStatsObserver*>::iterator it = observers_.begin();
        it != observers_.end(); ++it) {
     if (*it == observer)
       return;
@@ -99,9 +99,9 @@ void CallStats::RegisterStatsObserver(StatsObserver* observer) {
   observers_.push_back(observer);
 }
 
-void CallStats::DeregisterStatsObserver(StatsObserver* observer) {
+void CallStats::DeregisterStatsObserver(CallStatsObserver* observer) {
   CriticalSectionScoped cs(crit_.get());
-  for (std::list<StatsObserver*>::iterator it = observers_.begin();
+  for (std::list<CallStatsObserver*>::iterator it = observers_.begin();
        it != observers_.end(); ++it) {
     if (*it == observer) {
       observers_.erase(it);
diff --git a/webrtc/video_engine/call_stats.h b/webrtc/video_engine/call_stats.h
index 4a6c447b0d..5fd93a7624 100644
--- a/webrtc/video_engine/call_stats.h
+++ b/webrtc/video_engine/call_stats.h
@@ -21,7 +21,7 @@ namespace webrtc {
 
 class CriticalSectionWrapper;
 class RtcpRttObserver;
-class StatsObserver;
+class CallStatsObserver;
 
 // CallStats keeps track of statistics for a call.
 class CallStats : public Module {
@@ -40,8 +40,8 @@ class CallStats : public Module {
   RtcpRttObserver* rtcp_rtt_observer() const;
 
   // Registers/deregisters a new observer to receive statistics updates.
-  void RegisterStatsObserver(StatsObserver* observer);
-  void DeregisterStatsObserver(StatsObserver* observer);
+  void RegisterStatsObserver(CallStatsObserver* observer);
+  void DeregisterStatsObserver(CallStatsObserver* observer);
 
  protected:
   void OnRttUpdate(uint32_t rtt);
@@ -66,7 +66,7 @@ class CallStats : public Module {
   std::list<RttTime> reports_;
 
   // Observers getting stats reports.
-  std::list<StatsObserver*> observers_;
+  std::list<CallStatsObserver*> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CallStats);
 };
diff --git a/webrtc/video_engine/call_stats_unittest.cc b/webrtc/video_engine/call_stats_unittest.cc
index a6c8720312..4c14699738 100644
--- a/webrtc/video_engine/call_stats_unittest.cc
+++ b/webrtc/video_engine/call_stats_unittest.cc
@@ -22,7 +22,7 @@ using ::testing::Return;
 
 namespace webrtc {
 
-class MockStatsObserver : public StatsObserver {
+class MockStatsObserver : public CallStatsObserver {
  public:
   MockStatsObserver() {}
   virtual ~MockStatsObserver() {}
diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
index 3773db8e57..097a599d54 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -38,7 +38,7 @@ const int kInvalidRtpExtensionId = 0;
 static const int kMaxTargetDelayMs = 10000;
 
 // Helper class receiving statistics callbacks.
-class ChannelStatsObserver : public StatsObserver {
+class ChannelStatsObserver : public CallStatsObserver {
  public:
   explicit ChannelStatsObserver(ViEChannel* owner) : owner_(owner) {}
   virtual ~ChannelStatsObserver() {}
@@ -2170,7 +2170,7 @@ RtpRtcp* ViEChannel::rtp_rtcp() {
   return rtp_rtcp_.get();
 }
 
-StatsObserver* ViEChannel::GetStatsObserver() {
+CallStatsObserver* ViEChannel::GetStatsObserver() {
   return stats_observer_.get();
 }
 
diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h
index 40d11beb2f..2c1a9ca73c 100644
--- a/webrtc/video_engine/vie_channel.h
+++ b/webrtc/video_engine/vie_channel.h
@@ -31,6 +31,7 @@
 
 namespace webrtc {
 
+class CallStatsObserver;
 class ChannelStatsObserver;
 class CriticalSectionWrapper;
 class Encryption;
@@ -38,7 +39,6 @@ class PacedSender;
 class ProcessThread;
 class RtpRtcp;
 class RtcpRttObserver;
-class StatsObserver;
 class ThreadWrapper;
 class VideoCodingModule;
 class VideoDecoder;
@@ -308,7 +308,7 @@ class ViEChannel
   // Gets the modules used by the channel.
   RtpRtcp* rtp_rtcp();
 
-  StatsObserver* GetStatsObserver();
+  CallStatsObserver* GetStatsObserver();
 
   // Implements VCMReceiveCallback.
   virtual WebRtc_Word32 FrameToRender(I420VideoFrame& video_frame);  // NOLINT