diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index 8e181d3675..dc2c4c4317 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -270,8 +270,8 @@ if (rtc_include_tests) {
     defines = audio_coding_defines
     deps = []
     sources = [
-      "audio_coding/acm2/acm_receiver_unittest_oldapi.cc",
-      "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc",
+      "audio_coding/acm2/acm_receiver_unittest.cc",
+      "audio_coding/acm2/audio_coding_module_unittest.cc",
       "audio_coding/acm2/call_statistics_unittest.cc",
       "audio_coding/acm2/codec_manager_unittest.cc",
       "audio_coding/acm2/rent_a_codec_unittest.cc",
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 9b90959d1b..d1dc1edad8 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -891,8 +891,8 @@ if (rtc_include_tests) {
   rtc_source_set("acm_receive_test") {
     testonly = true
     sources = [
-      "acm2/acm_receive_test_oldapi.cc",
-      "acm2/acm_receive_test_oldapi.h",
+      "acm2/acm_receive_test.cc",
+      "acm2/acm_receive_test.h",
     ]
 
     defines = audio_coding_defines
@@ -907,8 +907,8 @@ if (rtc_include_tests) {
   rtc_source_set("acm_send_test") {
     testonly = true
     sources = [
-      "acm2/acm_send_test_oldapi.cc",
-      "acm2/acm_send_test_oldapi.h",
+      "acm2/acm_send_test.cc",
+      "acm2/acm_send_test.h",
     ]
 
     defines = audio_coding_defines
diff --git a/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_receive_test.cc
similarity index 99%
rename from webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
rename to webrtc/modules/audio_coding/acm2/acm_receive_test.cc
index 9f6eb5c9c0..056ff2273c 100644
--- a/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
+++ b/webrtc/modules/audio_coding/acm2/acm_receive_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.h"
+#include "webrtc/modules/audio_coding/acm2/acm_receive_test.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.h b/webrtc/modules/audio_coding/acm2/acm_receive_test.h
similarity index 93%
rename from webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.h
rename to webrtc/modules/audio_coding/acm2/acm_receive_test.h
index aab68aef7f..3145ad3812 100644
--- a/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.h
+++ b/webrtc/modules/audio_coding/acm2/acm_receive_test.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_
-#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_
+#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_
 
 #include <memory>
 #include <string>
@@ -99,4 +99,4 @@ class AcmReceiveTestToggleOutputFreqOldApi : public AcmReceiveTestOldApi {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc
similarity index 100%
rename from webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
rename to webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_send_test.cc
similarity index 98%
rename from webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc
rename to webrtc/modules/audio_coding/acm2/acm_send_test.cc
index bb588f07e1..5e68afc4d1 100644
--- a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc
+++ b/webrtc/modules/audio_coding/acm2/acm_send_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h"
+#include "webrtc/modules/audio_coding/acm2/acm_send_test.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/acm2/acm_send_test.h
similarity index 93%
rename from webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h
rename to webrtc/modules/audio_coding/acm2/acm_send_test.h
index 50b51a5559..96531a3294 100644
--- a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h
+++ b/webrtc/modules/audio_coding/acm2/acm_send_test.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_OLDAPI_H_
-#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_OLDAPI_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_
+#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_
 
 #include <memory>
 #include <vector>
@@ -85,4 +85,4 @@ class AcmSendTestOldApi : public AudioPacketizationCallback,
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_OLDAPI_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
rename to webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index c98ae0c219..1843f0d1e8 100644
--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -17,8 +17,8 @@
 #include "webrtc/base/md5digest.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/base/thread_annotations.h"
-#include "webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.h"
-#include "webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h"
+#include "webrtc/modules/audio_coding/acm2/acm_receive_test.h"
+#include "webrtc/modules/audio_coding/acm2/acm_send_test.h"
 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"