diff --git a/webrtc/modules/audio_processing/aec/aec_core.c b/webrtc/modules/audio_processing/aec/aec_core.c
index 104b3dd852..1b0f08fe0d 100644
--- a/webrtc/modules/audio_processing/aec/aec_core.c
+++ b/webrtc/modules/audio_processing/aec/aec_core.c
@@ -122,7 +122,7 @@ static void ComfortNoise(aec_t *aec, float efw[2][PART_LEN1],
                                   const float *noisePow, const float *lambda);
 
 static void WebRtcAec_InitLevel(power_level_t *level);
-static void WebRtcAec_InitStats(stats* stats);
+static void InitStats(Stats* stats);
 static void UpdateLevel(power_level_t* level, float in[2][PART_LEN1]);
 static void UpdateMetrics(aec_t *aec);
 // Convert from time domain to frequency domain. Note that |time_data| are
@@ -567,10 +567,10 @@ void WebRtcAec_InitMetrics(aec_t *aec)
     WebRtcAec_InitLevel(&aec->linoutlevel);
     WebRtcAec_InitLevel(&aec->nlpoutlevel);
 
-    WebRtcAec_InitStats(&aec->erl);
-    WebRtcAec_InitStats(&aec->erle);
-    WebRtcAec_InitStats(&aec->aNlp);
-    WebRtcAec_InitStats(&aec->rerl);
+    InitStats(&aec->erl);
+    InitStats(&aec->erle);
+    InitStats(&aec->aNlp);
+    InitStats(&aec->rerl);
 }
 
 void WebRtcAec_BufferFarendPartition(aec_t *aec, const float* farend) {
@@ -721,8 +721,8 @@ int WebRtcAec_echo_state(aec_t* self) {
   return self->echoState;
 }
 
-void WebRtcAec_GetEchoStats(aec_t* self, stats* erl, stats* erle,
-                            stats* a_nlp) {
+void WebRtcAec_GetEchoStats(aec_t* self, Stats* erl, Stats* erle,
+                            Stats* a_nlp) {
   assert(self != NULL);
   assert(erl != NULL);
   assert(erle != NULL);
@@ -1402,17 +1402,16 @@ static void WebRtcAec_InitLevel(power_level_t *level)
     level->sfrcounter = 0;
 }
 
-static void WebRtcAec_InitStats(stats* stats)
-{
-    stats->instant = offsetLevel;
-    stats->average = offsetLevel;
-    stats->max = offsetLevel;
-    stats->min = offsetLevel * (-1);
-    stats->sum = 0;
-    stats->hisum = 0;
-    stats->himean = offsetLevel;
-    stats->counter = 0;
-    stats->hicounter = 0;
+static void InitStats(Stats* stats) {
+  stats->instant = offsetLevel;
+  stats->average = offsetLevel;
+  stats->max = offsetLevel;
+  stats->min = offsetLevel * (-1);
+  stats->sum = 0;
+  stats->hisum = 0;
+  stats->himean = offsetLevel;
+  stats->counter = 0;
+  stats->hicounter = 0;
 }
 
 static void UpdateLevel(power_level_t* level, float in[2][PART_LEN1]) {
diff --git a/webrtc/modules/audio_processing/aec/aec_core.h b/webrtc/modules/audio_processing/aec/aec_core.h
index a740b0dc4c..8049c8c18a 100644
--- a/webrtc/modules/audio_processing/aec/aec_core.h
+++ b/webrtc/modules/audio_processing/aec/aec_core.h
@@ -55,7 +55,7 @@ typedef struct {
     float averagelevel;
 } power_level_t;
 
-typedef struct {
+typedef struct Stats {
   float instant;
   float average;
   float min;
@@ -65,7 +65,7 @@ typedef struct {
   float himean;
   int counter;
   int hicounter;
-} stats;
+} Stats;
 
 typedef struct {
     int farBufWritePos, farBufReadPos;
@@ -131,10 +131,10 @@ typedef struct {
 
     int metricsMode;
     int stateCounter;
-    stats erl;
-    stats erle;
-    stats aNlp;
-    stats rerl;
+    Stats erl;
+    Stats erle;
+    Stats aNlp;
+    Stats rerl;
 
     // Quantities to control H band scaling for SWB input
     int freq_avg_ic;  // initial bin for averaging nlp gain
@@ -188,6 +188,6 @@ int WebRtcAec_GetDelayMetricsCore(aec_t* self, int* median, int* std);
 // Returns the echo state (1: echo, 0: no echo).
 int WebRtcAec_echo_state(aec_t* self);
 // Gets statistics of the echo metrics ERL, ERLE, A_NLP.
-void WebRtcAec_GetEchoStats(aec_t* self, stats* erl, stats* erle, stats* a_nlp);
+void WebRtcAec_GetEchoStats(aec_t* self, Stats* erl, Stats* erle, Stats* a_nlp);
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_MAIN_SOURCE_AEC_CORE_H_
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.c b/webrtc/modules/audio_processing/aec/echo_cancellation.c
index 25f44e2d68..15655ac4ed 100644
--- a/webrtc/modules/audio_processing/aec/echo_cancellation.c
+++ b/webrtc/modules/audio_processing/aec/echo_cancellation.c
@@ -634,9 +634,9 @@ int WebRtcAec_GetMetrics(void* handle, AecMetrics* metrics) {
   float dtmp;
   int stmp;
   aecpc_t* self = (aecpc_t*)handle;
-  stats erl;
-  stats erle;
-  stats a_nlp;
+  Stats erl;
+  Stats erle;
+  Stats a_nlp;
 
   if (handle == NULL ) {
     return -1;