diff --git a/WATCHLISTS b/WATCHLISTS
index e21f04c02..7207f4797 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -60,9 +60,6 @@
     'neteq': {
       'filepath': 'webrtc/modules/audio_coding/neteq/.*',
     },
-    'neteq4': {
-      'filepath': 'webrtc/modules/audio_coding/neteq4/.*',
-    },
     'audio_processing': {
       'filepath': 'webrtc/modules/audio_processing/.*',
     },
@@ -118,7 +115,6 @@
                      'henrik.lundin@webrtc.org',
                      'kwiberg@webrtc.org'],
     'neteq': ['henrik.lundin@webrtc.org'],
-    'neteq4': ['henrik.lundin@webrtc.org'],
     'audio_processing': ['andrew@webrtc.org',
                          'bjornv@webrtc.org',
                          'kwiberg@webrtc.org'],
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
index fd30a137a..e55b6c466 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
@@ -20,7 +20,7 @@
 #include <assert.h>
 
 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 // Includes needed to create the codecs.
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
index 98869efee..65be793e3 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
@@ -18,7 +18,7 @@
 
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h
index 4f5dbc635..7e408de4a 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h
@@ -13,8 +13,8 @@
 
 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_isac.cc b/webrtc/modules/audio_coding/main/acm2/acm_isac.cc
index e27284212..d7be97155 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_isac.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_isac.cc
@@ -14,7 +14,7 @@
 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef WEBRTC_CODEC_ISAC
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
index 052bd4fcc..eeb912ad5 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
@@ -21,8 +21,8 @@
 #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
 #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h"
 #include "webrtc/modules/audio_coding/main/acm2/nack.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/logging.h"
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h
index 748744a4c..11440d121 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h
@@ -20,7 +20,7 @@
 #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
 #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h"
 #include "webrtc/modules/audio_coding/main/acm2/initial_delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
index c55eef952..4234f1464 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
@@ -16,7 +16,7 @@
 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/test_suite.h"
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
index 459313bb2..90dad6c55 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
@@ -36,7 +36,7 @@
       ],
       'dependencies': [
         '<@(audio_coding_dependencies)',
-        'NetEq4',
+        'neteq',
       ],
       'include_dirs': [
         '../interface',
diff --git a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h
index 1bfc0d354..cb0953aa4 100644
--- a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h
+++ b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h
@@ -15,7 +15,7 @@
 
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/modules/interface/module.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/neteq4/OWNERS b/webrtc/modules/audio_coding/neteq/OWNERS
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/OWNERS
rename to webrtc/modules/audio_coding/neteq/OWNERS
diff --git a/webrtc/modules/audio_coding/neteq4/accelerate.cc b/webrtc/modules/audio_coding/neteq/accelerate.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/accelerate.cc
rename to webrtc/modules/audio_coding/neteq/accelerate.cc
index eb546e976..6acd778a2 100644
--- a/webrtc/modules/audio_coding/neteq4/accelerate.cc
+++ b/webrtc/modules/audio_coding/neteq/accelerate.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq/accelerate.h"
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/accelerate.h b/webrtc/modules/audio_coding/neteq/accelerate.h
similarity index 89%
rename from webrtc/modules/audio_coding/neteq4/accelerate.h
rename to webrtc/modules/audio_coding/neteq/accelerate.h
index 0ee69520b..2da999326 100644
--- a/webrtc/modules/audio_coding/neteq4/accelerate.h
+++ b/webrtc/modules/audio_coding/neteq/accelerate.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/time_stretch.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -74,4 +74,4 @@ struct AccelerateFactory {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/audio_classifier.cc b/webrtc/modules/audio_coding/neteq/audio_classifier.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/audio_classifier.cc
rename to webrtc/modules/audio_coding/neteq/audio_classifier.cc
index a272fbce3..cc4bc97c3 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_classifier.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_classifier.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h"
+#include "webrtc/modules/audio_coding/neteq/audio_classifier.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/webrtc/modules/audio_coding/neteq4/audio_classifier.h b/webrtc/modules/audio_coding/neteq/audio_classifier.h
similarity index 89%
rename from webrtc/modules/audio_coding/neteq4/audio_classifier.h
rename to webrtc/modules/audio_coding/neteq/audio_classifier.h
index 1d041b301..e7b7807db 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_classifier.h
+++ b/webrtc/modules/audio_coding/neteq/audio_classifier.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
 
 #if defined(__cplusplus)
 extern "C" {
@@ -56,4 +56,4 @@ class AudioClassifier {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/audio_classifier_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/audio_classifier_unittest.cc
rename to webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc
index 0a6671816..cf623ca08 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_classifier_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h"
+#include "webrtc/modules/audio_coding/neteq/audio_classifier.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder.cc b/webrtc/modules/audio_coding/neteq/audio_decoder.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/audio_decoder.cc
rename to webrtc/modules/audio_coding/neteq/audio_decoder.cc
index 2a252e6f1..f539bb2e1 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 
 #include <assert.h>
 
-#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
+#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
rename to webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
index 94e507e02..6c7269a35 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
+#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
 
 #include <assert.h>
 #include <string.h>  // memmove
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h
rename to webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
index 93f6c9c6b..265d660bd 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
 
 #include <assert.h>
 
@@ -19,7 +19,7 @@
 #include "webrtc/engine_configurations.h"
 #endif
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -273,4 +273,4 @@ class AudioDecoderCng : public AudioDecoder {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/audio_decoder_unittest.cc
rename to webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
index dbd9d121f..f82644cbc 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
+#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate
new file mode 100644
index 000000000..bb57e74b3
--- /dev/null
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate
@@ -0,0 +1,40 @@
+# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+{
+  'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../../resources/',
+          '../../../../../data/',
+        ],
+      },
+    }],
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../../../../testing/test_env.py',
+          '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+        'isolate_dependency_touched': [
+          '../../../../DEPS',
+        ],
+        'isolate_dependency_tracked': [
+          '../../../../resources/audio_coding/testfile32kHz.pcm',
+          '../../../../testing/test_env.py',
+          '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+        'isolate_dependency_untracked': [
+          '../../../../tools/swarming_client/',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc
rename to webrtc/modules/audio_coding/neteq/audio_multi_vector.cc
index b49f8b0e8..5a208a697 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 
 #include <assert.h>
 
diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
rename to webrtc/modules/audio_coding/neteq/audio_multi_vector.h
index 25f45cf20..908de936d 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
+++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_
 
 #include <string.h>  // Access to size_t.
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -131,4 +131,4 @@ class AudioMultiVector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc
rename to webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
index be05a8260..947603852 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.cc b/webrtc/modules/audio_coding/neteq/audio_vector.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/audio_vector.cc
rename to webrtc/modules/audio_coding/neteq/audio_vector.cc
index cbd461630..d9fb4e58c 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_vector.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_vector.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_vector.h"
 
 #include <assert.h>
 
diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.h b/webrtc/modules/audio_coding/neteq/audio_vector.h
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/audio_vector.h
rename to webrtc/modules/audio_coding/neteq/audio_vector.h
index 265d68e84..f8aabdb8e 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_vector.h
+++ b/webrtc/modules/audio_coding/neteq/audio_vector.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
 
 #include <string.h>  // Access to size_t.
 
@@ -117,4 +117,4 @@ class AudioVector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc
rename to webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
index de5aac2d9..50da1fb46 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_vector.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.cc b/webrtc/modules/audio_coding/neteq/background_noise.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/background_noise.cc
rename to webrtc/modules/audio_coding/neteq/background_noise.cc
index 2dfb3c1f3..e00c4f65e 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise.cc
+++ b/webrtc/modules/audio_coding/neteq/background_noise.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
 
 #include <assert.h>
 #include <string.h>  // memcpy
@@ -16,8 +16,8 @@
 #include <algorithm>  // min, max
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.h b/webrtc/modules/audio_coding/neteq/background_noise.h
similarity index 92%
rename from webrtc/modules/audio_coding/neteq4/background_noise.h
rename to webrtc/modules/audio_coding/neteq/background_noise.h
index 3a63ebb94..8fb310ea8 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise.h
+++ b/webrtc/modules/audio_coding/neteq/background_noise.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_
 
 #include <string.h>  // size_t
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
@@ -134,4 +134,4 @@ class BackgroundNoise {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc
similarity index 91%
rename from webrtc/modules/audio_coding/neteq4/background_noise_unittest.cc
rename to webrtc/modules/audio_coding/neteq/background_noise_unittest.cc
index eb7b9fa1e..0aee62c97 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc
@@ -10,7 +10,7 @@
 
 // Unit tests for BackgroundNoise class.
 
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
 
 #include "gtest/gtest.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc b/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc
rename to webrtc/modules/audio_coding/neteq/buffer_level_filter.cc
index 70b493106..0388b1950 100644
--- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc
+++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
 
 #include <algorithm>  // Provide access to std::max.
 
diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h
similarity index 88%
rename from webrtc/modules/audio_coding/neteq4/buffer_level_filter.h
rename to webrtc/modules/audio_coding/neteq/buffer_level_filter.h
index 842634c5b..48f7f564c 100644
--- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.h
+++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_
 
 #include "webrtc/base/constructormagic.h"
 
@@ -44,4 +44,4 @@ class BufferLevelFilter {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
rename to webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
index ddaf08d1d..9589099d4 100644
--- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
@@ -10,7 +10,7 @@
 
 // Unit tests for BufferLevelFilter class.
 
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
 
 #include <math.h>  // Access to pow function.
 
diff --git a/webrtc/modules/audio_coding/neteq4/comfort_noise.cc b/webrtc/modules/audio_coding/neteq/comfort_noise.cc
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/comfort_noise.cc
rename to webrtc/modules/audio_coding/neteq/comfort_noise.cc
index 360767af1..31bb40c92 100644
--- a/webrtc/modules/audio_coding/neteq4/comfort_noise.cc
+++ b/webrtc/modules/audio_coding/neteq/comfort_noise.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h"
+#include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
 
 #include <assert.h>
 
 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/comfort_noise.h b/webrtc/modules/audio_coding/neteq/comfort_noise.h
similarity index 89%
rename from webrtc/modules/audio_coding/neteq4/comfort_noise.h
rename to webrtc/modules/audio_coding/neteq/comfort_noise.h
index 5c4e1ce04..d46559624 100644
--- a/webrtc/modules/audio_coding/neteq4/comfort_noise.h
+++ b/webrtc/modules/audio_coding/neteq/comfort_noise.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -70,4 +70,4 @@ class ComfortNoise {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/comfort_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc
similarity index 80%
rename from webrtc/modules/audio_coding/neteq4/comfort_noise_unittest.cc
rename to webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc
index 0e8497171..6a1bbe0d1 100644
--- a/webrtc/modules/audio_coding/neteq4/comfort_noise_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc
@@ -10,11 +10,11 @@
 
 // Unit tests for ComfortNoise class.
 
-#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h"
+#include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic.cc b/webrtc/modules/audio_coding/neteq/decision_logic.cc
similarity index 93%
rename from webrtc/modules/audio_coding/neteq4/decision_logic.cc
rename to webrtc/modules/audio_coding/neteq/decision_logic.cc
index 85edbb4dc..5fb054c78 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic.cc
+++ b/webrtc/modules/audio_coding/neteq/decision_logic.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
 
 #include <algorithm>
 
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h"
-#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic.h b/webrtc/modules/audio_coding/neteq/decision_logic.h
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/decision_logic.h
rename to webrtc/modules/audio_coding/neteq/decision_logic.h
index 38be6e6bf..672ce939d 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/defines.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/defines.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -165,4 +165,4 @@ class DecisionLogic {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc b/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc
rename to webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
index 00c8bcf4a..08a4c4cb6 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h"
 
 #include <assert.h>
 
 #include <algorithm>
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.h b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h
similarity index 90%
rename from webrtc/modules/audio_coding/neteq4/decision_logic_fax.h
rename to webrtc/modules/audio_coding/neteq/decision_logic_fax.h
index 2e35d2667..01a948fa4 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -60,4 +60,4 @@ class DecisionLogicFax : public DecisionLogic {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc
rename to webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
index a70f23b76..97a8843ae 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h"
 
 #include <assert.h>
 
 #include <algorithm>
 
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 #include "webrtc/modules/interface/module_common_types.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.h b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/decision_logic_normal.h
rename to webrtc/modules/audio_coding/neteq/decision_logic_normal.h
index 5b21193c6..a339d160f 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -104,4 +104,4 @@ class DecisionLogicNormal : public DecisionLogic {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_
diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_unittest.cc b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc
similarity index 84%
rename from webrtc/modules/audio_coding/neteq4/decision_logic_unittest.cc
rename to webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc
index 60a4b62a2..f9056a6cb 100644
--- a/webrtc/modules/audio_coding/neteq4/decision_logic_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc
@@ -11,12 +11,12 @@
 // Unit tests for DecisionLogic class and derived classes.
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database.cc b/webrtc/modules/audio_coding/neteq/decoder_database.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/decoder_database.cc
rename to webrtc/modules/audio_coding/neteq/decoder_database.cc
index 8d87519b2..5049962b4 100644
--- a/webrtc/modules/audio_coding/neteq4/decoder_database.cc
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 
 #include <assert.h>
 #include <utility>  // pair
 
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database.h b/webrtc/modules/audio_coding/neteq/decoder_database.h
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/decoder_database.h
rename to webrtc/modules/audio_coding/neteq/decoder_database.h
index 2e8825ae1..8a03f2123 100644
--- a/webrtc/modules/audio_coding/neteq4/decoder_database.h
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
 
 #include <map>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"  // NULL
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -155,4 +155,4 @@ class DecoderDatabase {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc
rename to webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc
index 66eddb52a..d0c6f5ae8 100644
--- a/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -18,7 +18,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/defines.h b/webrtc/modules/audio_coding/neteq/defines.h
similarity index 86%
rename from webrtc/modules/audio_coding/neteq4/defines.h
rename to webrtc/modules/audio_coding/neteq/defines.h
index b6f9eb2bc..33d1bd9c3 100644
--- a/webrtc/modules/audio_coding/neteq4/defines.h
+++ b/webrtc/modules/audio_coding/neteq/defines.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
 
 namespace webrtc {
 
@@ -48,4 +48,4 @@ enum Modes {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.cc b/webrtc/modules/audio_coding/neteq/delay_manager.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/delay_manager.cc
rename to webrtc/modules/audio_coding/neteq/delay_manager.cc
index e80b9de51..a935561ef 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_manager.cc
+++ b/webrtc/modules/audio_coding/neteq/delay_manager.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
 
 #include <assert.h>
 #include <math.h>
@@ -16,7 +16,7 @@
 #include <algorithm>  // max, min
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.h b/webrtc/modules/audio_coding/neteq/delay_manager.h
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/delay_manager.h
rename to webrtc/modules/audio_coding/neteq/delay_manager.h
index cc34352b5..96b5e19eb 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_manager.h
+++ b/webrtc/modules/audio_coding/neteq/delay_manager.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_
 
 #include <string.h>  // Provide access to size_t.
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -161,4 +161,4 @@ class DelayManager {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/delay_manager_unittest.cc
rename to webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc
index 482a65c9a..6f9733234 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_manager_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc
@@ -10,13 +10,13 @@
 
 // Unit tests for DelayManager class.
 
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
 
 #include <math.h>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc
rename to webrtc/modules/audio_coding/neteq/delay_peak_detector.cc
index fd5b9c08f..5996d7d19 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc
+++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
 
 #include <algorithm>  // max
 
diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h
similarity index 91%
rename from webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
rename to webrtc/modules/audio_coding/neteq/delay_peak_detector.h
index 59d27bc52..8bf6aba8b 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
+++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_
 
 #include <string.h>  // size_t
 
@@ -73,4 +73,4 @@ class DelayPeakDetector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc
rename to webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
index a3b48209c..080309be0 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
@@ -10,7 +10,7 @@
 
 // Unit tests for DelayPeakDetector class.
 
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
 
 #include "gtest/gtest.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc b/webrtc/modules/audio_coding/neteq/dsp_helper.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/dsp_helper.cc
rename to webrtc/modules/audio_coding/neteq/dsp_helper.cc
index e1aa0e53d..7451ae26f 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
+++ b/webrtc/modules/audio_coding/neteq/dsp_helper.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
 
 #include <assert.h>
 #include <string.h>  // Access to memset.
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.h b/webrtc/modules/audio_coding/neteq/dsp_helper.h
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/dsp_helper.h
rename to webrtc/modules/audio_coding/neteq/dsp_helper.h
index f2064858a..af4f4d6c8 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper.h
+++ b/webrtc/modules/audio_coding/neteq/dsp_helper.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_
 
 #include <string.h>  // Access to size_t.
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -133,4 +133,4 @@ class DspHelper {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper_unittest.cc b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/dsp_helper_unittest.cc
rename to webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc
index 852c2ec92..cbceff619 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc
rename to webrtc/modules/audio_coding/neteq/dtmf_buffer.cc
index 1c81ad940..91debee14 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc
+++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
 
 #include <assert.h>
 #include <algorithm>  // max
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/dtmf_buffer.h
rename to webrtc/modules/audio_coding/neteq/dtmf_buffer.h
index b901a971d..5dd31c2d2 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_
 
 #include <list>
 #include <string>  // size_t
@@ -113,4 +113,4 @@ class DtmfBuffer {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc
rename to webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
index 0b5ed65b8..83f981386 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
 
 #ifdef WIN32
 #include <winsock2.h>  // ntohl()
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc
rename to webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc
index c85534e9b..34c615d70 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc
+++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc
@@ -28,7 +28,7 @@
 // 852 Hz      7        8        9       14
 // 941 Hz     10        0       11       15
 
-#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
 
 #include <assert.h>
 
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
similarity index 87%
rename from webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h
rename to webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
index a0a83f1b5..fc1e5e4ad 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h
+++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_
 
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -53,4 +53,4 @@ class DtmfToneGenerator {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
rename to webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
index 37e8bbda9..94f79dc34 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
@@ -10,12 +10,12 @@
 
 // Unit tests for DtmfToneGenerator class.
 
-#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
 
 #include <math.h>
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/expand.cc b/webrtc/modules/audio_coding/neteq/expand.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/expand.cc
rename to webrtc/modules/audio_coding/neteq/expand.cc
index 9b08de15a..14a779822 100644
--- a/webrtc/modules/audio_coding/neteq4/expand.cc
+++ b/webrtc/modules/audio_coding/neteq/expand.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
 
 #include <assert.h>
 #include <string.h>  // memset
@@ -17,10 +17,10 @@
 #include <limits>  // numeric_limits<T>
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/expand.h b/webrtc/modules/audio_coding/neteq/expand.h
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/expand.h
rename to webrtc/modules/audio_coding/neteq/expand.h
index b5f440650..1acf951b9 100644
--- a/webrtc/modules/audio_coding/neteq4/expand.h
+++ b/webrtc/modules/audio_coding/neteq/expand.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
@@ -184,4 +184,4 @@ struct ExpandFactory {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
diff --git a/webrtc/modules/audio_coding/neteq4/expand_unittest.cc b/webrtc/modules/audio_coding/neteq/expand_unittest.cc
similarity index 82%
rename from webrtc/modules/audio_coding/neteq4/expand_unittest.cc
rename to webrtc/modules/audio_coding/neteq/expand_unittest.cc
index 353af2cf4..bd39f408f 100644
--- a/webrtc/modules/audio_coding/neteq4/expand_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/expand_unittest.cc
@@ -10,12 +10,12 @@
 
 // Unit tests for Expand class.
 
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h b/webrtc/modules/audio_coding/neteq/interface/audio_decoder.h
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h
rename to webrtc/modules/audio_coding/neteq/interface/audio_decoder.h
index 404572aa8..9a2fb8b46 100644
--- a/webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h
+++ b/webrtc/modules/audio_coding/neteq/interface/audio_decoder.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_
 
 #include <stdlib.h>  // NULL
 
@@ -149,4 +149,4 @@ class AudioDecoder {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/interface/neteq.h b/webrtc/modules/audio_coding/neteq/interface/neteq.h
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/interface/neteq.h
rename to webrtc/modules/audio_coding/neteq/interface/neteq.h
index 79a5dfb0b..c67ab12c6 100644
--- a/webrtc/modules/audio_coding/neteq4/interface/neteq.h
+++ b/webrtc/modules/audio_coding/neteq/interface/neteq.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
 
 #include <string.h>  // Provide access to size_t.
 
@@ -17,7 +17,7 @@
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -273,4 +273,4 @@ class NetEq {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
diff --git a/webrtc/modules/audio_coding/neteq4/merge.cc b/webrtc/modules/audio_coding/neteq/merge.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/merge.cc
rename to webrtc/modules/audio_coding/neteq/merge.cc
index 90068bb4a..d3d807751 100644
--- a/webrtc/modules/audio_coding/neteq4/merge.cc
+++ b/webrtc/modules/audio_coding/neteq/merge.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/merge.h"
+#include "webrtc/modules/audio_coding/neteq/merge.h"
 
 #include <assert.h>
 #include <string.h>  // memmove, memcpy, memset, size_t
@@ -16,10 +16,10 @@
 #include <algorithm>  // min, max
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/merge.h b/webrtc/modules/audio_coding/neteq/merge.h
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/merge.h
rename to webrtc/modules/audio_coding/neteq/merge.h
index 012e0af79..1bf0483df 100644
--- a/webrtc/modules/audio_coding/neteq4/merge.h
+++ b/webrtc/modules/audio_coding/neteq/merge.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -107,4 +107,4 @@ class Merge {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/merge_unittest.cc b/webrtc/modules/audio_coding/neteq/merge_unittest.cc
similarity index 74%
rename from webrtc/modules/audio_coding/neteq4/merge_unittest.cc
rename to webrtc/modules/audio_coding/neteq/merge_unittest.cc
index 1d7b1f1fe..fb5f789ff 100644
--- a/webrtc/modules/audio_coding/neteq4/merge_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/merge_unittest.cc
@@ -10,15 +10,15 @@
 
 // Unit tests for Merge class.
 
-#include "webrtc/modules/audio_coding/neteq4/merge.h"
+#include "webrtc/modules/audio_coding/neteq/merge.h"
 
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h
similarity index 80%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h
index a6d587447..edf3b54e9 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_
 
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 
 #include "gmock/gmock.h"
 
@@ -35,4 +35,4 @@ class MockAudioDecoder : public AudioDecoder {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_vector.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h
similarity index 83%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_audio_vector.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h
index 7a4747b0d..a5a787c7a 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_vector.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_
 
-#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_vector.h"
 
 #include "gmock/gmock.h"
 
@@ -48,4 +48,4 @@ class MockAudioVector : public AudioVector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
similarity index 75%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
index 872655172..d9210668d 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
 
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
 
 #include "gmock/gmock.h"
 
@@ -34,4 +34,4 @@ class MockBufferLevelFilter : public BufferLevelFilter {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h
similarity index 87%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h
index c4ca25a52..583fa54ba 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 
 #include "gmock/gmock.h"
 
@@ -61,4 +61,4 @@ class MockDecoderDatabase : public DecoderDatabase {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h
similarity index 86%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h
index 1edfb8737..c21a1c28c 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
 
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
 
 #include "gmock/gmock.h"
 
@@ -60,4 +60,4 @@ class MockDelayManager : public DelayManager {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
similarity index 76%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
index 211b2b91e..26e09329e 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
 
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
 
 #include "gmock/gmock.h"
 
@@ -31,4 +31,4 @@ class MockDelayPeakDetector : public DelayPeakDetector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
similarity index 77%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
index 5a89db46f..0351d6b1e 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_
 
-#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
 
 #include "gmock/gmock.h"
 
@@ -35,4 +35,4 @@ class MockDtmfBuffer : public DtmfBuffer {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
similarity index 74%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
index d34f7470e..3bed4d152 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
 
-#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
 
 #include "gmock/gmock.h"
 
@@ -32,4 +32,4 @@ class MockDtmfToneGenerator : public DtmfToneGenerator {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
similarity index 91%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
index b13affe10..9522b537e 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
 
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 
 #include "gmock/gmock.h"
 #include "webrtc/base/constructormagic.h"
@@ -96,4 +96,4 @@ class MockExternalPcm16B : public ExternalPcm16B {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h
similarity index 85%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h
index b1d8ef901..2882248c1 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_
 
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
 
 #include "gmock/gmock.h"
 
@@ -55,4 +55,4 @@ class MockPacketBuffer : public PacketBuffer {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h b/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h
similarity index 80%
rename from webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h
rename to webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h
index 369dfc43f..f1665423a 100644
--- a/webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_
 
-#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
 
 #include "gmock/gmock.h"
 
@@ -36,4 +36,4 @@ class MockPayloadSplitter : public PayloadSplitter {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/neteq.cc b/webrtc/modules/audio_coding/neteq/neteq.cc
similarity index 70%
rename from webrtc/modules/audio_coding/neteq4/neteq.cc
rename to webrtc/modules/audio_coding/neteq/neteq.cc
index 48dacea10..7edacde76 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq.cc
@@ -8,21 +8,21 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 
-#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
-#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h"
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
-#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
-#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/neteq.gypi
rename to webrtc/modules/audio_coding/neteq/neteq.gypi
index 280e51181..ccdc9f5df 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -33,7 +33,7 @@
   },
   'targets': [
     {
-      'target_name': 'NetEq4',
+      'target_name': 'neteq',
       'type': 'static_library',
       'dependencies': [
         '<@(neteq_dependencies)',
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc
rename to webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
index 3352d1890..a40107651 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
@@ -15,10 +15,10 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h"
+#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc b/webrtc/modules/audio_coding/neteq/neteq_impl.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/neteq_impl.cc
rename to webrtc/modules/audio_coding/neteq/neteq_impl.cc
index f86076608..64a866039 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h"
+#include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
 
 #include <assert.h>
 #include <memory.h>  // memset
@@ -16,28 +16,28 @@
 #include <algorithm>
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/defines.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
-#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/merge.h"
-#include "webrtc/modules/audio_coding/neteq4/normal.h"
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
-#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
-#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
-#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/defines.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/merge.h"
+#include "webrtc/modules/audio_coding/neteq/normal.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/logging.h"
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/neteq_impl.h
rename to webrtc/modules/audio_coding/neteq/neteq_impl.h
index 822a523a6..e92babd8e 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl.h
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/defines.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"  // Declare PacketList.
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/rtcp.h"
-#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/defines.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"  // Declare PacketList.
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/rtcp.h"
+#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/thread_annotations.h"
 #include "webrtc/typedefs.h"
@@ -403,4 +403,4 @@ class NetEqImpl : public webrtc::NetEq {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/neteq_impl_unittest.cc
rename to webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
index 26279aa93..2e66487fa 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -8,25 +8,25 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h"
-#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
-#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
 
 using ::testing::Return;
 using ::testing::ReturnNull;
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_stereo_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/neteq_stereo_unittest.cc
rename to webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
index e1d64411d..3c695c81d 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_stereo_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
@@ -16,9 +16,9 @@
 
 #include "gtest/gtest.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
similarity index 93%
rename from webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
rename to webrtc/modules/audio_coding/neteq/neteq_tests.gypi
index 2be473796..4d2ce252b 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
@@ -12,8 +12,8 @@
       'target_name': 'neteq_rtpplay',
       'type': 'executable',
       'dependencies': [
-        'NetEq4',
-        'NetEq4TestTools',
+        'neteq',
+        'neteq_test_tools',
         'neteq_unittest_tools',
         'PCM16B',
         '<(webrtc_root)/test/test.gyp:test_support_main',
@@ -31,7 +31,7 @@
       'type': 'executable',
       'dependencies': [
         # TODO(hlundin): Make RTPencode use ACM to encode files.
-        'NetEq4TestTools',# Test helpers
+        'neteq_test_tools',# Test helpers
         'G711',
         'G722',
         'PCM16B',
@@ -99,7 +99,7 @@
       'target_name': 'RTPchange',
       'type': 'executable',
       'dependencies': [
-        'NetEq4TestTools',
+        'neteq_test_tools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -111,7 +111,7 @@
       'target_name': 'RTPtimeshift',
       'type': 'executable',
       'dependencies': [
-       'NetEq4TestTools',
+       'neteq_test_tools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -123,7 +123,7 @@
       'target_name': 'RTPcat',
       'type': 'executable',
       'dependencies': [
-        'NetEq4TestTools',
+        'neteq_test_tools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -135,7 +135,7 @@
       'target_name': 'rtp_to_text',
       'type': 'executable',
       'dependencies': [
-        'NetEq4TestTools',
+        'neteq_test_tools',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
@@ -147,7 +147,7 @@
       'target_name': 'audio_classifier_test',
       'type': 'executable',
       'dependencies': [
-        'NetEq4',
+        'neteq',
       ],
       'sources': [
         'test/audio_classifier_test.cc',
@@ -158,7 +158,7 @@
       'target_name': 'neteq_test_support',
       'type': 'static_library',
       'dependencies': [
-        'NetEq4',
+        'neteq',
         'PCM16B',
         'neteq_unittest_tools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -173,10 +173,10 @@
     }, # neteq_test_support
 
     {
-      'target_name': 'neteq4_speed_test',
+      'target_name': 'neteq_speed_test',
       'type': 'executable',
       'dependencies': [
-        'NetEq4',
+        'neteq',
         'neteq_test_support',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/test/test.gyp:test_support_main',
@@ -187,10 +187,10 @@
     },
 
     {
-      'target_name': 'neteq4_opus_fec_quality_test',
+      'target_name': 'neteq_opus_fec_quality_test',
       'type': 'executable',
       'dependencies': [
-        'NetEq4',
+        'neteq',
         'neteq_test_support',
         'webrtc_opus',
         '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -203,7 +203,7 @@
     },
 
     {
-     'target_name': 'NetEq4TestTools',
+     'target_name': 'neteq_test_tools',
       # Collection of useful functions used in other tests.
       'type': 'static_library',
       'variables': {
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/neteq_unittest.cc
rename to webrtc/modules/audio_coding/neteq/neteq_unittest.cc
index c1a7e1652..0233e1950 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
@@ -12,7 +12,7 @@
  * This file includes unit tests for NetEQ.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 
 #include "gflags/gflags.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
diff --git a/webrtc/modules/audio_coding/neteq4/normal.cc b/webrtc/modules/audio_coding/neteq/normal.cc
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/normal.cc
rename to webrtc/modules/audio_coding/neteq/normal.cc
index 8d9c020f9..bfde179bd 100644
--- a/webrtc/modules/audio_coding/neteq4/normal.cc
+++ b/webrtc/modules/audio_coding/neteq/normal.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/normal.h"
+#include "webrtc/modules/audio_coding/neteq/normal.h"
 
 #include <string.h>  // memset, memcpy
 
@@ -16,11 +16,11 @@
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/normal.h b/webrtc/modules/audio_coding/neteq/normal.h
similarity index 87%
rename from webrtc/modules/audio_coding/neteq4/normal.h
rename to webrtc/modules/audio_coding/neteq/normal.h
index 1be5c7fd4..aa24b528a 100644
--- a/webrtc/modules/audio_coding/neteq4/normal.h
+++ b/webrtc/modules/audio_coding/neteq/normal.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_
 
 #include <string.h>  // Access to size_t.
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/defines.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/defines.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -65,4 +65,4 @@ class Normal {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_
diff --git a/webrtc/modules/audio_coding/neteq4/normal_unittest.cc b/webrtc/modules/audio_coding/neteq/normal_unittest.cc
similarity index 71%
rename from webrtc/modules/audio_coding/neteq4/normal_unittest.cc
rename to webrtc/modules/audio_coding/neteq/normal_unittest.cc
index 2bd7b894f..c855865cf 100644
--- a/webrtc/modules/audio_coding/neteq4/normal_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/normal_unittest.cc
@@ -10,16 +10,16 @@
 
 // Unit tests for Normal class.
 
-#include "webrtc/modules/audio_coding/neteq4/normal.h"
+#include "webrtc/modules/audio_coding/neteq/normal.h"
 
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/expand.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/packet.h b/webrtc/modules/audio_coding/neteq/packet.h
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/packet.h
rename to webrtc/modules/audio_coding/neteq/packet.h
index 4518f9138..89ddda782 100644
--- a/webrtc/modules/audio_coding/neteq4/packet.h
+++ b/webrtc/modules/audio_coding/neteq/packet.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
 
 #include <list>
 
@@ -85,4 +85,4 @@ struct Packet {
 typedef std::list<Packet*> PacketList;
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer.cc b/webrtc/modules/audio_coding/neteq/packet_buffer.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/packet_buffer.cc
rename to webrtc/modules/audio_coding/neteq/packet_buffer.cc
index da3bdf14b..8a81c2598 100644
--- a/webrtc/modules/audio_coding/neteq4/packet_buffer.cc
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer.cc
@@ -12,12 +12,12 @@
 // an STL list. The list is kept sorted at all times so that the next packet to
 // decode is at the beginning of the list.
 
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
 
 #include <algorithm>  // find_if()
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer.h b/webrtc/modules/audio_coding/neteq/packet_buffer.h
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/packet_buffer.h
rename to webrtc/modules/audio_coding/neteq/packet_buffer.h
index 3b068c3a9..76c4ddd16 100644
--- a/webrtc/modules/audio_coding/neteq4/packet_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -132,4 +132,4 @@ class PacketBuffer {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/packet_buffer_unittest.cc
rename to webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
index 387ca146c..5e6b89fdc 100644
--- a/webrtc/modules/audio_coding/neteq4/packet_buffer_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
@@ -10,12 +10,12 @@
 
 // Unit tests for PacketBuffer class.
 
-#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 
 using ::testing::Return;
 using ::testing::_;
diff --git a/webrtc/modules/audio_coding/neteq4/payload_splitter.cc b/webrtc/modules/audio_coding/neteq/payload_splitter.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/payload_splitter.cc
rename to webrtc/modules/audio_coding/neteq/payload_splitter.cc
index 0e97b7d8f..1d61ef0cf 100644
--- a/webrtc/modules/audio_coding/neteq4/payload_splitter.cc
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
 
 #include <assert.h>
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/payload_splitter.h b/webrtc/modules/audio_coding/neteq/payload_splitter.h
similarity index 93%
rename from webrtc/modules/audio_coding/neteq4/payload_splitter.h
rename to webrtc/modules/audio_coding/neteq/payload_splitter.h
index 5086409ad..a3dd77e5a 100644
--- a/webrtc/modules/audio_coding/neteq4/payload_splitter.h
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 
 namespace webrtc {
 
@@ -87,4 +87,4 @@ class PayloadSplitter {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/payload_splitter_unittest.cc b/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/payload_splitter_unittest.cc
rename to webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc
index c83a9b582..5cde1bda5 100644
--- a/webrtc/modules/audio_coding/neteq4/payload_splitter_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc
@@ -10,15 +10,15 @@
 
 // Unit tests for PayloadSplitter class.
 
-#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
 
 #include <assert.h>
 
 #include <utility>  // pair
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 using ::testing::Return;
diff --git a/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc b/webrtc/modules/audio_coding/neteq/post_decode_vad.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/post_decode_vad.cc
rename to webrtc/modules/audio_coding/neteq/post_decode_vad.cc
index c3d5c7edd..7ae7f97ab 100644
--- a/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc
+++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/post_decode_vad.h b/webrtc/modules/audio_coding/neteq/post_decode_vad.h
similarity index 83%
rename from webrtc/modules/audio_coding/neteq4/post_decode_vad.h
rename to webrtc/modules/audio_coding/neteq/post_decode_vad.h
index 327de1aac..e713009c8 100644
--- a/webrtc/modules/audio_coding/neteq4/post_decode_vad.h
+++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_
 
 #include <string>  // size_t
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
 #include "webrtc/common_types.h"  // NULL
-#include "webrtc/modules/audio_coding/neteq4/defines.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/defines.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -69,4 +69,4 @@ class PostDecodeVad {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_
diff --git a/webrtc/modules/audio_coding/neteq4/post_decode_vad_unittest.cc b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc
similarity index 90%
rename from webrtc/modules/audio_coding/neteq4/post_decode_vad_unittest.cc
rename to webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc
index a4d9da8e1..ed48db858 100644
--- a/webrtc/modules/audio_coding/neteq4/post_decode_vad_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc
@@ -10,7 +10,7 @@
 
 // Unit tests for PostDecodeVad class.
 
-#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h"
 
 #include "gtest/gtest.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc b/webrtc/modules/audio_coding/neteq/preemptive_expand.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/preemptive_expand.cc
rename to webrtc/modules/audio_coding/neteq/preemptive_expand.cc
index dace45eb9..b2dc3e60c 100644
--- a/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc
+++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
 
 #include <algorithm>  // min, max
 
diff --git a/webrtc/modules/audio_coding/neteq4/preemptive_expand.h b/webrtc/modules/audio_coding/neteq/preemptive_expand.h
similarity index 90%
rename from webrtc/modules/audio_coding/neteq4/preemptive_expand.h
rename to webrtc/modules/audio_coding/neteq/preemptive_expand.h
index 4d20ae634..1aa613301 100644
--- a/webrtc/modules/audio_coding/neteq4/preemptive_expand.h
+++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/time_stretch.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -84,4 +84,4 @@ struct PreemptiveExpandFactory {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_
diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.cc b/webrtc/modules/audio_coding/neteq/random_vector.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/random_vector.cc
rename to webrtc/modules/audio_coding/neteq/random_vector.cc
index e7a5a1d1b..b12f21715 100644
--- a/webrtc/modules/audio_coding/neteq4/random_vector.cc
+++ b/webrtc/modules/audio_coding/neteq/random_vector.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.h b/webrtc/modules/audio_coding/neteq/random_vector.h
similarity index 86%
rename from webrtc/modules/audio_coding/neteq4/random_vector.h
rename to webrtc/modules/audio_coding/neteq/random_vector.h
index 2c67ebbf0..767dc48ee 100644
--- a/webrtc/modules/audio_coding/neteq4/random_vector.h
+++ b/webrtc/modules/audio_coding/neteq/random_vector.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_
 
 #include <string.h>  // size_t
 
@@ -47,4 +47,4 @@ class RandomVector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/random_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc
similarity index 91%
rename from webrtc/modules/audio_coding/neteq4/random_vector_unittest.cc
rename to webrtc/modules/audio_coding/neteq/random_vector_unittest.cc
index 83193e2a7..cbdcdf7c8 100644
--- a/webrtc/modules/audio_coding/neteq4/random_vector_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc
@@ -10,7 +10,7 @@
 
 // Unit tests for RandomVector class.
 
-#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq/random_vector.h"
 
 #include "gtest/gtest.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/rtcp.cc b/webrtc/modules/audio_coding/neteq/rtcp.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/rtcp.cc
rename to webrtc/modules/audio_coding/neteq/rtcp.cc
index bc178fc3a..cf8e0280b 100644
--- a/webrtc/modules/audio_coding/neteq4/rtcp.cc
+++ b/webrtc/modules/audio_coding/neteq/rtcp.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/rtcp.h"
+#include "webrtc/modules/audio_coding/neteq/rtcp.h"
 
 #include <string.h>
 
diff --git a/webrtc/modules/audio_coding/neteq4/rtcp.h b/webrtc/modules/audio_coding/neteq/rtcp.h
similarity index 89%
rename from webrtc/modules/audio_coding/neteq4/rtcp.h
rename to webrtc/modules/audio_coding/neteq/rtcp.h
index d46566782..2a765efa5 100644
--- a/webrtc/modules/audio_coding/neteq4/rtcp.h
+++ b/webrtc/modules/audio_coding/neteq/rtcp.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -55,4 +55,4 @@ class Rtcp {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_
diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
rename to webrtc/modules/audio_coding/neteq/statistics_calculator.cc
index b6e9222d4..383f70555 100644
--- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
+++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
+#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
 
 #include <assert.h>
 #include <string.h>  // memset
 
-#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
-#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.h b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
similarity index 92%
rename from webrtc/modules/audio_coding/neteq4/statistics_calculator.h
rename to webrtc/modules/audio_coding/neteq/statistics_calculator.h
index 30f9377a0..07ef8536f 100644
--- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.h
+++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -106,4 +106,4 @@ class StatisticsCalculator {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_
diff --git a/webrtc/modules/audio_coding/neteq4/sync_buffer.cc b/webrtc/modules/audio_coding/neteq/sync_buffer.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/sync_buffer.cc
rename to webrtc/modules/audio_coding/neteq/sync_buffer.cc
index 75ee6ece0..d1802e174 100644
--- a/webrtc/modules/audio_coding/neteq4/sync_buffer.cc
+++ b/webrtc/modules/audio_coding/neteq/sync_buffer.cc
@@ -12,7 +12,7 @@
 
 #include <algorithm>  // Access to min.
 
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/sync_buffer.h b/webrtc/modules/audio_coding/neteq/sync_buffer.h
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/sync_buffer.h
rename to webrtc/modules/audio_coding/neteq/sync_buffer.h
index 8deb95003..59bd4d87e 100644
--- a/webrtc/modules/audio_coding/neteq4/sync_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/sync_buffer.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -98,4 +98,4 @@ class SyncBuffer : public AudioMultiVector {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/sync_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/sync_buffer_unittest.cc
rename to webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc
index 1aafa22ab..1a3d0fe78 100644
--- a/webrtc/modules/audio_coding/neteq4/sync_buffer_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 #include "gtest/gtest.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc
rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc
diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h
rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h
diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc
rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h
rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
diff --git a/webrtc/modules/audio_coding/neteq4/test/PayloadTypes.h b/webrtc/modules/audio_coding/neteq/test/PayloadTypes.h
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/PayloadTypes.h
rename to webrtc/modules/audio_coding/neteq/test/PayloadTypes.h
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPcat.cc b/webrtc/modules/audio_coding/neteq/test/RTPcat.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/test/RTPcat.cc
rename to webrtc/modules/audio_coding/neteq/test/RTPcat.cc
index 87189cfe9..f06b574f0 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPcat.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPcat.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
 
 #define FIRSTLINELEN 40
 
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPchange.cc b/webrtc/modules/audio_coding/neteq/test/RTPchange.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/test/RTPchange.cc
rename to webrtc/modules/audio_coding/neteq/test/RTPchange.cc
index 30bee86a6..54395c026 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPchange.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPchange.cc
@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h"
-#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
 
 #define FIRSTLINELEN 40
 //#define WEBRTC_DUMMY_RTP
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
rename to webrtc/modules/audio_coding/neteq/test/RTPencode.cc
index bc806091b..93b366b9a 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
@@ -25,8 +25,8 @@
 
 #include "webrtc/typedefs.h"
 // needed for NetEqDecoder
-#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
 
 /************************/
 /* Define payload types */
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
rename to webrtc/modules/audio_coding/neteq/test/RTPjitter.cc
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPtimeshift.cc b/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/RTPtimeshift.cc
rename to webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc
diff --git a/webrtc/modules/audio_coding/neteq4/test/audio_classifier_test.cc b/webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/test/audio_classifier_test.cc
rename to webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc
index 730406bb9..aa2b61d06 100644
--- a/webrtc/modules/audio_coding/neteq4/test/audio_classifier_test.cc
+++ b/webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h"
+#include "webrtc/modules/audio_coding/neteq/audio_classifier.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/webrtc/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m b/webrtc/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m
rename to webrtc/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
diff --git a/webrtc/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m b/webrtc/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m
rename to webrtc/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
diff --git a/webrtc/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc
rename to webrtc/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc
index aa4522b1f..ad6d8ece4 100644
--- a/webrtc/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc
+++ b/webrtc/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc
@@ -10,7 +10,7 @@
 
 #include <gflags/gflags.h>
 #include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h"
+#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 using google::RegisterFlagValidator;
diff --git a/webrtc/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc b/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc
rename to webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
index f669742ce..14857c772 100644
--- a/webrtc/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
@@ -9,7 +9,7 @@
  */
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h"
+#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
 #include "webrtc/test/testsupport/perf_test.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/test/neteq_speed_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/test/neteq_speed_test.cc
rename to webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc
index cecd48b70..05e75f34e 100644
--- a/webrtc/modules/audio_coding/neteq4/test/neteq_speed_test.cc
+++ b/webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc
@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include "gflags/gflags.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h"
+#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
 #include "webrtc/typedefs.h"
 
 // Flag validators.
diff --git a/webrtc/modules/audio_coding/neteq4/test/rtp_to_text.cc b/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc
similarity index 100%
rename from webrtc/modules/audio_coding/neteq4/test/rtp_to_text.cc
rename to webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc
diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.cc b/webrtc/modules/audio_coding/neteq/time_stretch.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/time_stretch.cc
rename to webrtc/modules/audio_coding/neteq/time_stretch.cc
index 5b246c113..a9228d498 100644
--- a/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+++ b/webrtc/modules/audio_coding/neteq/time_stretch.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
+#include "webrtc/modules/audio_coding/neteq/time_stretch.h"
 
 #include <algorithm>  // min, max
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.h b/webrtc/modules/audio_coding/neteq/time_stretch.h
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/time_stretch.h
rename to webrtc/modules/audio_coding/neteq/time_stretch.h
index cd110b12e..9396d8ff5 100644
--- a/webrtc/modules/audio_coding/neteq4/time_stretch.h
+++ b/webrtc/modules/audio_coding/neteq/time_stretch.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_
 
 #include <assert.h>
 #include <string.h>  // memset, size_t
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -108,4 +108,4 @@ class TimeStretch {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_
diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch_unittest.cc b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc
similarity index 89%
rename from webrtc/modules/audio_coding/neteq4/time_stretch_unittest.cc
rename to webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc
index 529038ac3..64789b4d4 100644
--- a/webrtc/modules/audio_coding/neteq4/time_stretch_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc
@@ -10,11 +10,11 @@
 
 // Unit tests for Accelerate and PreemptiveExpand classes.
 
-#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
-#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq/background_noise.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc
rename to webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
index b2b5b40a3..01890136a 100644
--- a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
 
-#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/defines.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/defines.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.h b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
similarity index 88%
rename from webrtc/modules/audio_coding/neteq4/timestamp_scaler.h
rename to webrtc/modules/audio_coding/neteq/timestamp_scaler.h
index 604b5999b..59b8cc7d1 100644
--- a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.h
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -65,4 +65,4 @@ class TimestampScaler {
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_
diff --git a/webrtc/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc
rename to webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
index c67609467..8cbbfa393 100644
--- a/webrtc/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq4/packet.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq/packet.h"
 
 using ::testing::Return;
 using ::testing::ReturnNull;
diff --git a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.cc b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/tools/audio_loop.cc
rename to webrtc/modules/audio_coding/neteq/tools/audio_loop.cc
index 94ea5bef0..2d2a7e3dd 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h"
+#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.h b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h
similarity index 90%
rename from webrtc/modules/audio_coding/neteq4/tools/audio_loop.h
rename to webrtc/modules/audio_coding/neteq/tools/audio_loop.h
index 144898eb5..9647d827a 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.h
+++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@ class AudioLoop {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.cc b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/tools/input_audio_file.cc
rename to webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc
index 62692e27d..806317320 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
+#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
similarity index 88%
rename from webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
rename to webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
index 7325d0465..274f8ea07 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
+++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_
 
 #include <stdio.h>
 
@@ -48,4 +48,4 @@ class InputAudioFile {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
similarity index 94%
rename from webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.cc
rename to webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
index 2eb74628b..433546fbc 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h"
+#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
 
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h
similarity index 80%
rename from webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h
rename to webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h
index 1b205c03c..d094db0f9 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_
 
 #include "webrtc/typedefs.h"
 
@@ -29,4 +29,4 @@ class NetEqPerformanceTest {
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.cc
rename to webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
index 8daca18fb..fc5d8abaf 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h"
+#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
similarity index 87%
rename from webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h
rename to webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
index 03aabc884..87fc50794 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
 
 #include <string>
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
@@ -97,4 +97,4 @@ class NetEqQualityTest : public ::testing::Test {
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
rename to webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
index 1308bf5dc..3c5f6b0bb 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
@@ -20,10 +20,10 @@
 
 #include "google/gflags.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
-#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h"
-#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
+#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet.cc b/webrtc/modules/audio_coding/neteq/tools/packet.cc
similarity index 98%
rename from webrtc/modules/audio_coding/neteq4/tools/packet.cc
rename to webrtc/modules/audio_coding/neteq/tools/packet.cc
index 6e0778b38..d8fb7134f 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/packet.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/packet.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet.h b/webrtc/modules/audio_coding/neteq/tools/packet.h
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/tools/packet.h
rename to webrtc/modules/audio_coding/neteq/tools/packet.h
index 03586bc0d..eb8ce28a2 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/packet.h
+++ b/webrtc/modules/audio_coding/neteq/tools/packet.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_
 
 #include <list>
 
@@ -114,4 +114,4 @@ class Packet {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet_source.h b/webrtc/modules/audio_coding/neteq/tools/packet_source.h
similarity index 80%
rename from webrtc/modules/audio_coding/neteq4/tools/packet_source.h
rename to webrtc/modules/audio_coding/neteq/tools/packet_source.h
index 261ae7886..c539b8e83 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/packet_source.h
+++ b/webrtc/modules/audio_coding/neteq/tools/packet_source.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_
 
 #include "webrtc/base/constructormagic.h"
 
@@ -33,4 +33,4 @@ class PacketSource {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet_unittest.cc b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc
similarity index 99%
rename from webrtc/modules/audio_coding/neteq4/tools/packet_unittest.cc
rename to webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc
index b6c0713d1..df844ee84 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/packet_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc
@@ -10,7 +10,7 @@
 
 // Unit tests for test Packet class.
 
-#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 
 #include "gtest/gtest.h"
 
diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_analyze.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc
similarity index 97%
rename from webrtc/modules/audio_coding/neteq4/tools/rtp_analyze.cc
rename to webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc
index 71a6c3c6c..773cc2c89 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/rtp_analyze.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc
@@ -13,8 +13,8 @@
 #include <vector>
 
 #include "google/gflags.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h"
+#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 // Flag validator.
diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc
similarity index 96%
rename from webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.cc
rename to webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc
index ceedde01c..827863539 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
 
 #include <assert.h>
 #include <string.h>
@@ -18,7 +18,7 @@
 #include <netinet/in.h>
 #endif
 
-#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
 
 namespace webrtc {
diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
similarity index 86%
rename from webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h
rename to webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
index 86197d911..527018e18 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_
 
 #include <stdio.h>
 #include <string>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
-#include "webrtc/modules/audio_coding/neteq4/tools/packet_source.h"
+#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
@@ -63,4 +63,4 @@ class RtpFileSource : public PacketSource {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_
diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc
similarity index 95%
rename from webrtc/modules/audio_coding/neteq4/tools/rtp_generator.cc
rename to webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc
index 8d9a89d54..17ac209f1 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
similarity index 89%
rename from webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h
rename to webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
index e1fe8027b..d3824c8d2 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/interface/module_common_types.h"
@@ -54,4 +54,4 @@ class RtpGenerator {
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 701ee7700..8dec125b0 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -17,7 +17,7 @@
     'audio_coding/codecs/isac/fix/source/isacfix.gypi',
     'audio_coding/codecs/pcm16b/pcm16b.gypi',
     'audio_coding/main/acm2/audio_coding_module.gypi',
-    'audio_coding/neteq4/neteq.gypi',
+    'audio_coding/neteq/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
     'audio_device/audio_device.gypi',
     'audio_processing/audio_processing.gypi',
@@ -75,8 +75,8 @@
             'desktop_capture',
             'iSACFix',
             'media_file',
-            'NetEq4',
-            'NetEq4TestTools',
+            'neteq',
+            'neteq_test_tools',
             'neteq_unittest_tools',
             'paced_sender',
             'PCM16B',  # Needed by NetEq tests.
@@ -112,45 +112,45 @@
             'audio_coding/codecs/isac/fix/source/transform_unittest.cc',
             'audio_coding/codecs/isac/main/source/isac_unittest.cc',
             'audio_coding/codecs/opus/opus_unittest.cc',
-            'audio_coding/neteq4/audio_classifier_unittest.cc',
-            'audio_coding/neteq4/audio_multi_vector_unittest.cc',
-            'audio_coding/neteq4/audio_vector_unittest.cc',
-            'audio_coding/neteq4/background_noise_unittest.cc',
-            'audio_coding/neteq4/buffer_level_filter_unittest.cc',
-            'audio_coding/neteq4/comfort_noise_unittest.cc',
-            'audio_coding/neteq4/decision_logic_unittest.cc',
-            'audio_coding/neteq4/decoder_database_unittest.cc',
-            'audio_coding/neteq4/delay_manager_unittest.cc',
-            'audio_coding/neteq4/delay_peak_detector_unittest.cc',
-            'audio_coding/neteq4/dsp_helper_unittest.cc',
-            'audio_coding/neteq4/dtmf_buffer_unittest.cc',
-            'audio_coding/neteq4/dtmf_tone_generator_unittest.cc',
-            'audio_coding/neteq4/expand_unittest.cc',
-            'audio_coding/neteq4/merge_unittest.cc',
-            'audio_coding/neteq4/neteq_external_decoder_unittest.cc',
-            'audio_coding/neteq4/neteq_impl_unittest.cc',
-            'audio_coding/neteq4/neteq_stereo_unittest.cc',
-            'audio_coding/neteq4/neteq_unittest.cc',
-            'audio_coding/neteq4/normal_unittest.cc',
-            'audio_coding/neteq4/packet_buffer_unittest.cc',
-            'audio_coding/neteq4/payload_splitter_unittest.cc',
-            'audio_coding/neteq4/post_decode_vad_unittest.cc',
-            'audio_coding/neteq4/random_vector_unittest.cc',
-            'audio_coding/neteq4/sync_buffer_unittest.cc',
-            'audio_coding/neteq4/timestamp_scaler_unittest.cc',
-            'audio_coding/neteq4/time_stretch_unittest.cc',
-            'audio_coding/neteq4/mock/mock_audio_decoder.h',
-            'audio_coding/neteq4/mock/mock_audio_vector.h',
-            'audio_coding/neteq4/mock/mock_buffer_level_filter.h',
-            'audio_coding/neteq4/mock/mock_decoder_database.h',
-            'audio_coding/neteq4/mock/mock_delay_manager.h',
-            'audio_coding/neteq4/mock/mock_delay_peak_detector.h',
-            'audio_coding/neteq4/mock/mock_dtmf_buffer.h',
-            'audio_coding/neteq4/mock/mock_dtmf_tone_generator.h',
-            'audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h',
-            'audio_coding/neteq4/mock/mock_packet_buffer.h',
-            'audio_coding/neteq4/mock/mock_payload_splitter.h',
-            'audio_coding/neteq4/tools/packet_unittest.cc',
+            'audio_coding/neteq/audio_classifier_unittest.cc',
+            'audio_coding/neteq/audio_multi_vector_unittest.cc',
+            'audio_coding/neteq/audio_vector_unittest.cc',
+            'audio_coding/neteq/background_noise_unittest.cc',
+            'audio_coding/neteq/buffer_level_filter_unittest.cc',
+            'audio_coding/neteq/comfort_noise_unittest.cc',
+            'audio_coding/neteq/decision_logic_unittest.cc',
+            'audio_coding/neteq/decoder_database_unittest.cc',
+            'audio_coding/neteq/delay_manager_unittest.cc',
+            'audio_coding/neteq/delay_peak_detector_unittest.cc',
+            'audio_coding/neteq/dsp_helper_unittest.cc',
+            'audio_coding/neteq/dtmf_buffer_unittest.cc',
+            'audio_coding/neteq/dtmf_tone_generator_unittest.cc',
+            'audio_coding/neteq/expand_unittest.cc',
+            'audio_coding/neteq/merge_unittest.cc',
+            'audio_coding/neteq/neteq_external_decoder_unittest.cc',
+            'audio_coding/neteq/neteq_impl_unittest.cc',
+            'audio_coding/neteq/neteq_stereo_unittest.cc',
+            'audio_coding/neteq/neteq_unittest.cc',
+            'audio_coding/neteq/normal_unittest.cc',
+            'audio_coding/neteq/packet_buffer_unittest.cc',
+            'audio_coding/neteq/payload_splitter_unittest.cc',
+            'audio_coding/neteq/post_decode_vad_unittest.cc',
+            'audio_coding/neteq/random_vector_unittest.cc',
+            'audio_coding/neteq/sync_buffer_unittest.cc',
+            'audio_coding/neteq/timestamp_scaler_unittest.cc',
+            'audio_coding/neteq/time_stretch_unittest.cc',
+            'audio_coding/neteq/mock/mock_audio_decoder.h',
+            'audio_coding/neteq/mock/mock_audio_vector.h',
+            'audio_coding/neteq/mock/mock_buffer_level_filter.h',
+            'audio_coding/neteq/mock/mock_decoder_database.h',
+            'audio_coding/neteq/mock/mock_delay_manager.h',
+            'audio_coding/neteq/mock/mock_delay_peak_detector.h',
+            'audio_coding/neteq/mock/mock_dtmf_buffer.h',
+            'audio_coding/neteq/mock/mock_dtmf_tone_generator.h',
+            'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h',
+            'audio_coding/neteq/mock/mock_packet_buffer.h',
+            'audio_coding/neteq/mock/mock_payload_splitter.h',
+            'audio_coding/neteq/tools/packet_unittest.cc',
             'audio_processing/aec/system_delay_unittest.cc',
             'audio_processing/aec/echo_cancellation_unittest.cc',
             'audio_processing/echo_cancellation_impl_unittest.cc',
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index a76126c8d..3c1dca69e 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -75,7 +75,7 @@
       'target_name': 'webrtc_perf_tests',
       'type': '<(gtest_target_type)',
       'sources': [
-        'modules/audio_coding/neteq4/test/neteq_performance_unittest.cc',
+        'modules/audio_coding/neteq/test/neteq_performance_unittest.cc',
         'video/call_perf_tests.cc',
         'video/full_stack.cc',
         'video/rampup_tests.cc',