Revert 6257 "Rename neteq4 folder to neteq" > Rename neteq4 folder to neteq > > BUG=2996 > R=turaj@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/12569005 TBR=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13549004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6259 4adac7df-926f-26a2-2b94-8c16560cd09d

commit: 81f6488b6089d80da9aad6f71969276ec6268663 [log] [tgz]
author: henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed May 28 07:33:39 2014
committer: henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed May 28 07:33:39 2014
tree: 4ceb6f77d40f46ce53eb718a5b04b5906bec282d
parent: 1bdf186e6ae8d2f1a7d055237a75c0d7fd189624 [diff]
diff --git a/modules/audio_coding/main/acm2/acm_codec_database.cc b/modules/audio_coding/main/acm2/acm_codec_database.cc
index e55b6c4..fd30a13 100644
--- a/modules/audio_coding/main/acm2/acm_codec_database.cc
+++ b/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/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 // Includes needed to create the codecs.

diff --git a/modules/audio_coding/main/acm2/acm_codec_database.h b/modules/audio_coding/main/acm2/acm_codec_database.h
index 65be793..98869ef 100644
--- a/modules/audio_coding/main/acm2/acm_codec_database.h
+++ b/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/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/main/acm2/acm_generic_codec.h b/modules/audio_coding/main/acm2/acm_generic_codec.h
index 75f6b27..1ea61d0 100644
--- a/modules/audio_coding/main/acm2/acm_generic_codec.h
+++ b/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/neteq/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 

diff --git a/modules/audio_coding/main/acm2/acm_isac.cc b/modules/audio_coding/main/acm2/acm_isac.cc
index d7be971..e272842 100644
--- a/modules/audio_coding/main/acm2/acm_isac.cc
+++ b/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/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef WEBRTC_CODEC_ISAC

diff --git a/modules/audio_coding/main/acm2/acm_receiver.cc b/modules/audio_coding/main/acm2/acm_receiver.cc
index a0d18c2..613491a 100644
--- a/modules/audio_coding/main/acm2/acm_receiver.cc
+++ b/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/neteq/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/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/modules/audio_coding/main/acm2/acm_receiver.h b/modules/audio_coding/main/acm2/acm_receiver.h
index ba342ac..7a238ae 100644
--- a/modules/audio_coding/main/acm2/acm_receiver.h
+++ b/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/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/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/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
index 4234f14..c55eef9 100644
--- a/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
+++ b/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/neteq/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq4/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/modules/audio_coding/main/acm2/audio_coding_module.gypi b/modules/audio_coding/main/acm2/audio_coding_module.gypi
index 90dad6c..459313b 100644
--- a/modules/audio_coding/main/acm2/audio_coding_module.gypi
+++ b/modules/audio_coding/main/acm2/audio_coding_module.gypi

@@ -36,7 +36,7 @@
       ],
       'dependencies': [
         '<@(audio_coding_dependencies)',
-        'neteq',
+        'NetEq4',
       ],
       'include_dirs': [
         '../interface',

diff --git a/modules/audio_coding/main/interface/audio_coding_module.h b/modules/audio_coding/main/interface/audio_coding_module.h
index cb0953a..1bfc0d3 100644
--- a/modules/audio_coding/main/interface/audio_coding_module.h
+++ b/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/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 #include "webrtc/modules/interface/module.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/typedefs.h"

diff --git a/modules/audio_coding/neteq/OWNERS b/modules/audio_coding/neteq4/OWNERS
similarity index 100%
rename from modules/audio_coding/neteq/OWNERS
rename to modules/audio_coding/neteq4/OWNERS


diff --git a/modules/audio_coding/neteq/accelerate.cc b/modules/audio_coding/neteq4/accelerate.cc
similarity index 98%
rename from modules/audio_coding/neteq/accelerate.cc
rename to modules/audio_coding/neteq4/accelerate.cc
index 6acd778..eb546e9 100644
--- a/modules/audio_coding/neteq/accelerate.cc
+++ b/modules/audio_coding/neteq4/accelerate.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 

diff --git a/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq4/accelerate.h
similarity index 89%
rename from modules/audio_coding/neteq/accelerate.h
rename to modules/audio_coding/neteq4/accelerate.h
index 2da9993..0ee6952 100644
--- a/modules/audio_coding/neteq/accelerate.h
+++ b/modules/audio_coding/neteq4/accelerate.h

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq/time_stretch.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -74,4 +74,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_

diff --git a/modules/audio_coding/neteq/audio_classifier.cc b/modules/audio_coding/neteq4/audio_classifier.cc
similarity index 97%
rename from modules/audio_coding/neteq/audio_classifier.cc
rename to modules/audio_coding/neteq4/audio_classifier.cc
index cc4bc97..a272fbc 100644
--- a/modules/audio_coding/neteq/audio_classifier.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_classifier.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h"
 
 #include <assert.h>
 #include <string.h>

diff --git a/modules/audio_coding/neteq/audio_classifier.h b/modules/audio_coding/neteq4/audio_classifier.h
similarity index 88%
rename from modules/audio_coding/neteq/audio_classifier.h
rename to modules/audio_coding/neteq4/audio_classifier.h
index e7b7807..1d041b3 100644
--- a/modules/audio_coding/neteq/audio_classifier.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_AUDIO_CLASSIFIER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_
 
 #if defined(__cplusplus)
 extern "C" {
@@ -56,4 +56,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_

diff --git a/modules/audio_coding/neteq/audio_classifier_unittest.cc b/modules/audio_coding/neteq4/audio_classifier_unittest.cc
similarity index 97%
rename from modules/audio_coding/neteq/audio_classifier_unittest.cc
rename to modules/audio_coding/neteq4/audio_classifier_unittest.cc
index cf623ca..0a66718 100644
--- a/modules/audio_coding/neteq/audio_classifier_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_classifier.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h"
 
 #include <math.h>
 #include <stdio.h>

diff --git a/modules/audio_coding/neteq/audio_decoder.cc b/modules/audio_coding/neteq4/audio_decoder.cc
similarity index 97%
rename from modules/audio_coding/neteq/audio_decoder.cc
rename to modules/audio_coding/neteq4/audio_decoder.cc
index f539bb2..2a252e6 100644
--- a/modules/audio_coding/neteq/audio_decoder.cc
+++ b/modules/audio_coding/neteq4/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/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 
 #include <assert.h>
 
-#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/audio_decoder_impl.cc b/modules/audio_coding/neteq4/audio_decoder_impl.cc
similarity index 99%
rename from modules/audio_coding/neteq/audio_decoder_impl.cc
rename to modules/audio_coding/neteq4/audio_decoder_impl.cc
index 6c7269a..94e507e 100644
--- a/modules/audio_coding/neteq/audio_decoder_impl.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_decoder_impl.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
 
 #include <assert.h>
 #include <string.h>  // memmove

diff --git a/modules/audio_coding/neteq/audio_decoder_impl.h b/modules/audio_coding/neteq4/audio_decoder_impl.h
similarity index 96%
rename from modules/audio_coding/neteq/audio_decoder_impl.h
rename to modules/audio_coding/neteq4/audio_decoder_impl.h
index 265d660..93f6c9c 100644
--- a/modules/audio_coding/neteq/audio_decoder_impl.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_AUDIO_DECODER_IMPL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_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/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -273,4 +273,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_

diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq4/audio_decoder_unittest.cc
similarity index 99%
rename from modules/audio_coding/neteq/audio_decoder_unittest.cc
rename to modules/audio_coding/neteq4/audio_decoder_unittest.cc
index f82644c..dbd9d12 100644
--- a/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_decoder_impl.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/modules/audio_coding/neteq/audio_decoder_unittests.isolate b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
similarity index 100%
rename from modules/audio_coding/neteq/audio_decoder_unittests.isolate
rename to modules/audio_coding/neteq4/audio_decoder_unittests.isolate


diff --git a/modules/audio_coding/neteq/audio_multi_vector.cc b/modules/audio_coding/neteq4/audio_multi_vector.cc
similarity index 98%
rename from modules/audio_coding/neteq/audio_multi_vector.cc
rename to modules/audio_coding/neteq4/audio_multi_vector.cc
index 5a208a6..b49f8b0 100644
--- a/modules/audio_coding/neteq/audio_multi_vector.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 
 #include <assert.h>
 

diff --git a/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq4/audio_multi_vector.h
similarity index 95%
rename from modules/audio_coding/neteq/audio_multi_vector.h
rename to modules/audio_coding/neteq4/audio_multi_vector.h
index 908de93..25f45cf 100644
--- a/modules/audio_coding/neteq/audio_multi_vector.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_AUDIO_MULTI_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
 
 #include <string.h>  // Access to size_t.
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -131,4 +131,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_

diff --git a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc
similarity index 99%
rename from modules/audio_coding/neteq/audio_multi_vector_unittest.cc
rename to modules/audio_coding/neteq4/audio_multi_vector_unittest.cc
index 9476038..be05a82 100644
--- a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/modules/audio_coding/neteq/audio_vector.cc b/modules/audio_coding/neteq4/audio_vector.cc
similarity index 98%
rename from modules/audio_coding/neteq/audio_vector.cc
rename to modules/audio_coding/neteq4/audio_vector.cc
index d9fb4e5..cbd4616 100644
--- a/modules/audio_coding/neteq/audio_vector.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
 
 #include <assert.h>
 

diff --git a/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq4/audio_vector.h
similarity index 95%
rename from modules/audio_coding/neteq/audio_vector.h
rename to modules/audio_coding/neteq4/audio_vector.h
index f8aabdb..265d68e 100644
--- a/modules/audio_coding/neteq/audio_vector.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_AUDIO_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
 
 #include <string.h>  // Access to size_t.
 
@@ -117,4 +117,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_

diff --git a/modules/audio_coding/neteq/audio_vector_unittest.cc b/modules/audio_coding/neteq4/audio_vector_unittest.cc
similarity index 99%
rename from modules/audio_coding/neteq/audio_vector_unittest.cc
rename to modules/audio_coding/neteq4/audio_vector_unittest.cc
index 50da1fb..de5aac2 100644
--- a/modules/audio_coding/neteq/audio_vector_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/modules/audio_coding/neteq/background_noise.cc b/modules/audio_coding/neteq4/background_noise.cc
similarity index 97%
rename from modules/audio_coding/neteq/background_noise.cc
rename to modules/audio_coding/neteq4/background_noise.cc
index e00c4f6..2dfb3c1 100644
--- a/modules/audio_coding/neteq/background_noise.cc
+++ b/modules/audio_coding/neteq4/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/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq4/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/neteq/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq4/background_noise.h
similarity index 92%
rename from modules/audio_coding/neteq/background_noise.h
rename to modules/audio_coding/neteq4/background_noise.h
index 8fb310e..3a63ebb 100644
--- a/modules/audio_coding/neteq/background_noise.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_BACKGROUND_NOISE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
 
 #include <string.h>  // size_t
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
@@ -134,4 +134,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_

diff --git a/modules/audio_coding/neteq/background_noise_unittest.cc b/modules/audio_coding/neteq4/background_noise_unittest.cc
similarity index 90%
rename from modules/audio_coding/neteq/background_noise_unittest.cc
rename to modules/audio_coding/neteq4/background_noise_unittest.cc
index 0aee62c..eb7b9fa 100644
--- a/modules/audio_coding/neteq/background_noise_unittest.cc
+++ b/modules/audio_coding/neteq4/background_noise_unittest.cc

@@ -10,7 +10,7 @@
 
 // Unit tests for BackgroundNoise class.
 
-#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
 
 #include "gtest/gtest.h"
 

diff --git a/modules/audio_coding/neteq/buffer_level_filter.cc b/modules/audio_coding/neteq4/buffer_level_filter.cc
similarity index 96%
rename from modules/audio_coding/neteq/buffer_level_filter.cc
rename to modules/audio_coding/neteq4/buffer_level_filter.cc
index 0388b19..70b4931 100644
--- a/modules/audio_coding/neteq/buffer_level_filter.cc
+++ b/modules/audio_coding/neteq4/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/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
 
 #include <algorithm>  // Provide access to std::max.
 

diff --git a/modules/audio_coding/neteq/buffer_level_filter.h b/modules/audio_coding/neteq4/buffer_level_filter.h
similarity index 88%
rename from modules/audio_coding/neteq/buffer_level_filter.h
rename to modules/audio_coding/neteq4/buffer_level_filter.h
index 48f7f56..842634c 100644
--- a/modules/audio_coding/neteq/buffer_level_filter.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_BUFFER_LEVEL_FILTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_
 
 #include "webrtc/base/constructormagic.h"
 
@@ -44,4 +44,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_

diff --git a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/buffer_level_filter_unittest.cc
rename to modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
index 9589099..ddaf08d 100644
--- a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
+++ b/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc

@@ -10,7 +10,7 @@
 
 // Unit tests for BufferLevelFilter class.
 
-#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
 
 #include <math.h>  // Access to pow function.
 

diff --git a/modules/audio_coding/neteq/comfort_noise.cc b/modules/audio_coding/neteq4/comfort_noise.cc
similarity index 93%
rename from modules/audio_coding/neteq/comfort_noise.cc
rename to modules/audio_coding/neteq4/comfort_noise.cc
index 31bb40c..360767a 100644
--- a/modules/audio_coding/neteq/comfort_noise.cc
+++ b/modules/audio_coding/neteq4/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/neteq/comfort_noise.h"
+#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h"
 
 #include <assert.h>
 
 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq4/comfort_noise.h
similarity index 89%
rename from modules/audio_coding/neteq/comfort_noise.h
rename to modules/audio_coding/neteq4/comfort_noise.h
index d465596..5c4e1ce 100644
--- a/modules/audio_coding/neteq/comfort_noise.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_COMFORT_NOISE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -70,4 +70,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_

diff --git a/modules/audio_coding/neteq/comfort_noise_unittest.cc b/modules/audio_coding/neteq4/comfort_noise_unittest.cc
similarity index 79%
rename from modules/audio_coding/neteq/comfort_noise_unittest.cc
rename to modules/audio_coding/neteq4/comfort_noise_unittest.cc
index 6a1bbe0..0e84971 100644
--- a/modules/audio_coding/neteq/comfort_noise_unittest.cc
+++ b/modules/audio_coding/neteq4/comfort_noise_unittest.cc

@@ -10,11 +10,11 @@
 
 // Unit tests for ComfortNoise class.
 
-#include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
+#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/decision_logic.cc b/modules/audio_coding/neteq4/decision_logic.cc
similarity index 92%
rename from modules/audio_coding/neteq/decision_logic.cc
rename to modules/audio_coding/neteq4/decision_logic.cc
index 5fb054c..85edbb4 100644
--- a/modules/audio_coding/neteq/decision_logic.cc
+++ b/modules/audio_coding/neteq4/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/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
 
 #include <algorithm>
 
-#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/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/system_wrappers/interface/logging.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq4/decision_logic.h
similarity index 95%
rename from modules/audio_coding/neteq/decision_logic.h
rename to modules/audio_coding/neteq4/decision_logic.h
index 672ce93..38be6e6 100644
--- a/modules/audio_coding/neteq/decision_logic.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DECISION_LOGIC_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/defines.h"
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/defines.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -165,4 +165,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_

diff --git a/modules/audio_coding/neteq/decision_logic_fax.cc b/modules/audio_coding/neteq4/decision_logic_fax.cc
similarity index 93%
rename from modules/audio_coding/neteq/decision_logic_fax.cc
rename to modules/audio_coding/neteq4/decision_logic_fax.cc
index 08a4c4c..00c8bcf 100644
--- a/modules/audio_coding/neteq/decision_logic_fax.cc
+++ b/modules/audio_coding/neteq4/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/neteq/decision_logic_fax.h"
+#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h"
 
 #include <assert.h>
 
 #include <algorithm>
 
-#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/decision_logic_fax.h b/modules/audio_coding/neteq4/decision_logic_fax.h
similarity index 90%
rename from modules/audio_coding/neteq/decision_logic_fax.h
rename to modules/audio_coding/neteq4/decision_logic_fax.h
index 01a948f..2e35d26 100644
--- a/modules/audio_coding/neteq/decision_logic_fax.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DECISION_LOGIC_FAX_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -60,4 +60,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_

diff --git a/modules/audio_coding/neteq/decision_logic_normal.cc b/modules/audio_coding/neteq4/decision_logic_normal.cc
similarity index 94%
rename from modules/audio_coding/neteq/decision_logic_normal.cc
rename to modules/audio_coding/neteq4/decision_logic_normal.cc
index 97a8843..a70f23b 100644
--- a/modules/audio_coding/neteq/decision_logic_normal.cc
+++ b/modules/audio_coding/neteq4/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/neteq/decision_logic_normal.h"
+#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h"
 
 #include <assert.h>
 
 #include <algorithm>
 
-#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/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/interface/module_common_types.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/decision_logic_normal.h b/modules/audio_coding/neteq4/decision_logic_normal.h
similarity index 94%
rename from modules/audio_coding/neteq/decision_logic_normal.h
rename to modules/audio_coding/neteq4/decision_logic_normal.h
index a339d16..5b21193 100644
--- a/modules/audio_coding/neteq/decision_logic_normal.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DECISION_LOGIC_NORMAL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -104,4 +104,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_

diff --git a/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq4/decision_logic_unittest.cc
similarity index 84%
rename from modules/audio_coding/neteq/decision_logic_unittest.cc
rename to modules/audio_coding/neteq4/decision_logic_unittest.cc
index f9056a6..60a4b62 100644
--- a/modules/audio_coding/neteq/decision_logic_unittest.cc
+++ b/modules/audio_coding/neteq4/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/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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/decoder_database.cc b/modules/audio_coding/neteq4/decoder_database.cc
similarity index 98%
rename from modules/audio_coding/neteq/decoder_database.cc
rename to modules/audio_coding/neteq4/decoder_database.cc
index 5049962..8d87519 100644
--- a/modules/audio_coding/neteq/decoder_database.cc
+++ b/modules/audio_coding/neteq4/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/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
 
 #include <assert.h>
 #include <utility>  // pair
 
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/decoder_database.h b/modules/audio_coding/neteq4/decoder_database.h
similarity index 94%
rename from modules/audio_coding/neteq/decoder_database.h
rename to modules/audio_coding/neteq4/decoder_database.h
index 8a03f21..2e8825a 100644
--- a/modules/audio_coding/neteq/decoder_database.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DECODER_DATABASE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_
 
 #include <map>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"  // NULL
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -155,4 +155,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_

diff --git a/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq4/decoder_database_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/decoder_database_unittest.cc
rename to modules/audio_coding/neteq4/decoder_database_unittest.cc
index d0c6f5a..66eddb5 100644
--- a/modules/audio_coding/neteq/decoder_database_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/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/neteq/mock/mock_audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/defines.h b/modules/audio_coding/neteq4/defines.h
similarity index 86%
rename from modules/audio_coding/neteq/defines.h
rename to modules/audio_coding/neteq4/defines.h
index 33d1bd9..b6f9eb2 100644
--- a/modules/audio_coding/neteq/defines.h
+++ b/modules/audio_coding/neteq4/defines.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_
 
 namespace webrtc {
 
@@ -48,4 +48,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_

diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq4/delay_manager.cc
similarity index 98%
rename from modules/audio_coding/neteq/delay_manager.cc
rename to modules/audio_coding/neteq4/delay_manager.cc
index a935561..e80b9de 100644
--- a/modules/audio_coding/neteq/delay_manager.cc
+++ b/modules/audio_coding/neteq4/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/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq4/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/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 

diff --git a/modules/audio_coding/neteq/delay_manager.h b/modules/audio_coding/neteq4/delay_manager.h
similarity index 96%
rename from modules/audio_coding/neteq/delay_manager.h
rename to modules/audio_coding/neteq4/delay_manager.h
index 96b5e19..cc34352 100644
--- a/modules/audio_coding/neteq/delay_manager.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DELAY_MANAGER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
 
 #include <string.h>  // Provide access to size_t.
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -161,4 +161,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_

diff --git a/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq4/delay_manager_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/delay_manager_unittest.cc
rename to modules/audio_coding/neteq4/delay_manager_unittest.cc
index 6f97332..482a65c 100644
--- a/modules/audio_coding/neteq/delay_manager_unittest.cc
+++ b/modules/audio_coding/neteq4/delay_manager_unittest.cc

@@ -10,13 +10,13 @@
 
 // Unit tests for DelayManager class.
 
-#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
 
 #include <math.h>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/delay_peak_detector.cc b/modules/audio_coding/neteq4/delay_peak_detector.cc
similarity index 97%
rename from modules/audio_coding/neteq/delay_peak_detector.cc
rename to modules/audio_coding/neteq4/delay_peak_detector.cc
index 5996d7d..fd5b9c0 100644
--- a/modules/audio_coding/neteq/delay_peak_detector.cc
+++ b/modules/audio_coding/neteq4/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/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
 
 #include <algorithm>  // max
 

diff --git a/modules/audio_coding/neteq/delay_peak_detector.h b/modules/audio_coding/neteq4/delay_peak_detector.h
similarity index 91%
rename from modules/audio_coding/neteq/delay_peak_detector.h
rename to modules/audio_coding/neteq4/delay_peak_detector.h
index 8bf6aba..59d27bc 100644
--- a/modules/audio_coding/neteq/delay_peak_detector.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DELAY_PEAK_DETECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
 
 #include <string.h>  // size_t
 
@@ -73,4 +73,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_

diff --git a/modules/audio_coding/neteq/delay_peak_detector_unittest.cc b/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/delay_peak_detector_unittest.cc
rename to modules/audio_coding/neteq4/delay_peak_detector_unittest.cc
index 080309b..a3b4820 100644
--- a/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
+++ b/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc

@@ -10,7 +10,7 @@
 
 // Unit tests for DelayPeakDetector class.
 
-#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
 
 #include "gtest/gtest.h"
 

diff --git a/modules/audio_coding/neteq/dsp_helper.cc b/modules/audio_coding/neteq4/dsp_helper.cc
similarity index 99%
rename from modules/audio_coding/neteq/dsp_helper.cc
rename to modules/audio_coding/neteq4/dsp_helper.cc
index 7451ae2..e1aa0e5 100644
--- a/modules/audio_coding/neteq/dsp_helper.cc
+++ b/modules/audio_coding/neteq4/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/neteq/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
 
 #include <assert.h>
 #include <string.h>  // Access to memset.

diff --git a/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq4/dsp_helper.h
similarity index 96%
rename from modules/audio_coding/neteq/dsp_helper.h
rename to modules/audio_coding/neteq4/dsp_helper.h
index af4f4d6..f206485 100644
--- a/modules/audio_coding/neteq/dsp_helper.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DSP_HELPER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
 
 #include <string.h>  // Access to size_t.
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -133,4 +133,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_

diff --git a/modules/audio_coding/neteq/dsp_helper_unittest.cc b/modules/audio_coding/neteq4/dsp_helper_unittest.cc
similarity index 95%
rename from modules/audio_coding/neteq/dsp_helper_unittest.cc
rename to modules/audio_coding/neteq4/dsp_helper_unittest.cc
index cbceff6..852c2ec 100644
--- a/modules/audio_coding/neteq/dsp_helper_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/dtmf_buffer.cc b/modules/audio_coding/neteq4/dtmf_buffer.cc
similarity index 99%
rename from modules/audio_coding/neteq/dtmf_buffer.cc
rename to modules/audio_coding/neteq4/dtmf_buffer.cc
index 91debee..1c81ad9 100644
--- a/modules/audio_coding/neteq/dtmf_buffer.cc
+++ b/modules/audio_coding/neteq4/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/neteq/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
 
 #include <assert.h>
 #include <algorithm>  // max

diff --git a/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq4/dtmf_buffer.h
similarity index 94%
rename from modules/audio_coding/neteq/dtmf_buffer.h
rename to modules/audio_coding/neteq4/dtmf_buffer.h
index 5dd31c2..b901a97 100644
--- a/modules/audio_coding/neteq/dtmf_buffer.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DTMF_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_
 
 #include <list>
 #include <string>  // size_t
@@ -113,4 +113,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_

diff --git a/modules/audio_coding/neteq/dtmf_buffer_unittest.cc b/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc
similarity index 99%
rename from modules/audio_coding/neteq/dtmf_buffer_unittest.cc
rename to modules/audio_coding/neteq4/dtmf_buffer_unittest.cc
index 83f9813..0b5ed65 100644
--- a/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
 
 #ifdef WIN32
 #include <winsock2.h>  // ntohl()

diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.cc b/modules/audio_coding/neteq4/dtmf_tone_generator.cc
similarity index 98%
rename from modules/audio_coding/neteq/dtmf_tone_generator.cc
rename to modules/audio_coding/neteq4/dtmf_tone_generator.cc
index 34c615d..c85534e 100644
--- a/modules/audio_coding/neteq/dtmf_tone_generator.cc
+++ b/modules/audio_coding/neteq4/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/neteq/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
 
 #include <assert.h>
 

diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq4/dtmf_tone_generator.h
similarity index 87%
rename from modules/audio_coding/neteq/dtmf_tone_generator.h
rename to modules/audio_coding/neteq4/dtmf_tone_generator.h
index fc1e5e4..a0a83f1 100644
--- a/modules/audio_coding/neteq/dtmf_tone_generator.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_DTMF_TONE_GENERATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_
 
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -53,4 +53,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_

diff --git a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
similarity index 97%
rename from modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
rename to modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
index 94f79dc..37e8bbd 100644
--- a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
+++ b/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc

@@ -10,12 +10,12 @@
 
 // Unit tests for DtmfToneGenerator class.
 
-#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
 
 #include <math.h>
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/expand.cc b/modules/audio_coding/neteq4/expand.cc
similarity index 98%
rename from modules/audio_coding/neteq/expand.cc
rename to modules/audio_coding/neteq4/expand.cc
index 14a7798..9b08de1 100644
--- a/modules/audio_coding/neteq/expand.cc
+++ b/modules/audio_coding/neteq4/expand.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq4/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/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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq4/expand.h
similarity index 96%
rename from modules/audio_coding/neteq/expand.h
rename to modules/audio_coding/neteq4/expand.h
index 1acf951..b5f4406 100644
--- a/modules/audio_coding/neteq/expand.h
+++ b/modules/audio_coding/neteq4/expand.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
@@ -184,4 +184,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_

diff --git a/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq4/expand_unittest.cc
similarity index 82%
rename from modules/audio_coding/neteq/expand_unittest.cc
rename to modules/audio_coding/neteq4/expand_unittest.cc
index bd39f40..353af2c 100644
--- a/modules/audio_coding/neteq/expand_unittest.cc
+++ b/modules/audio_coding/neteq4/expand_unittest.cc

@@ -10,12 +10,12 @@
 
 // Unit tests for Expand class.
 
-#include "webrtc/modules/audio_coding/neteq/expand.h"
+#include "webrtc/modules/audio_coding/neteq4/expand.h"
 
 #include "gtest/gtest.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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/interface/audio_decoder.h b/modules/audio_coding/neteq4/interface/audio_decoder.h
similarity index 95%
rename from modules/audio_coding/neteq/interface/audio_decoder.h
rename to modules/audio_coding/neteq4/interface/audio_decoder.h
index 9a2fb8b..404572a 100644
--- a/modules/audio_coding/neteq/interface/audio_decoder.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_INTERFACE_AUDIO_DECODER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_
 
 #include <stdlib.h>  // NULL
 
@@ -149,4 +149,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_

diff --git a/modules/audio_coding/neteq/interface/neteq.h b/modules/audio_coding/neteq4/interface/neteq.h
similarity index 97%
rename from modules/audio_coding/neteq/interface/neteq.h
rename to modules/audio_coding/neteq4/interface/neteq.h
index df37734..763da31 100644
--- a/modules/audio_coding/neteq/interface/neteq.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_INTERFACE_NETEQ_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_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/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -272,4 +272,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_

diff --git a/modules/audio_coding/neteq/merge.cc b/modules/audio_coding/neteq4/merge.cc
similarity index 97%
rename from modules/audio_coding/neteq/merge.cc
rename to modules/audio_coding/neteq4/merge.cc
index d3d8077..90068bb 100644
--- a/modules/audio_coding/neteq/merge.cc
+++ b/modules/audio_coding/neteq4/merge.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq/merge.h"
+#include "webrtc/modules/audio_coding/neteq4/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/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/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/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq4/merge.h
similarity index 94%
rename from modules/audio_coding/neteq/merge.h
rename to modules/audio_coding/neteq4/merge.h
index 1bf0483..012e0af 100644
--- a/modules/audio_coding/neteq/merge.h
+++ b/modules/audio_coding/neteq4/merge.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -107,4 +107,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_

diff --git a/modules/audio_coding/neteq/merge_unittest.cc b/modules/audio_coding/neteq4/merge_unittest.cc
similarity index 74%
rename from modules/audio_coding/neteq/merge_unittest.cc
rename to modules/audio_coding/neteq4/merge_unittest.cc
index fb5f789..1d7b1f1 100644
--- a/modules/audio_coding/neteq/merge_unittest.cc
+++ b/modules/audio_coding/neteq4/merge_unittest.cc

@@ -10,15 +10,15 @@
 
 // Unit tests for Merge class.
 
-#include "webrtc/modules/audio_coding/neteq/merge.h"
+#include "webrtc/modules/audio_coding/neteq4/merge.h"
 
 #include <vector>
 
 #include "gtest/gtest.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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/mock/mock_audio_decoder.h b/modules/audio_coding/neteq4/mock/mock_audio_decoder.h
similarity index 80%
rename from modules/audio_coding/neteq/mock/mock_audio_decoder.h
rename to modules/audio_coding/neteq4/mock/mock_audio_decoder.h
index edf3b54..a6d5874 100644
--- a/modules/audio_coding/neteq/mock/mock_audio_decoder.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_
 
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 
 #include "gmock/gmock.h"
 
@@ -35,4 +35,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_

diff --git a/modules/audio_coding/neteq/mock/mock_audio_vector.h b/modules/audio_coding/neteq4/mock/mock_audio_vector.h
similarity index 83%
rename from modules/audio_coding/neteq/mock/mock_audio_vector.h
rename to modules/audio_coding/neteq4/mock/mock_audio_vector.h
index a5a787c..7a4747b 100644
--- a/modules/audio_coding/neteq/mock/mock_audio_vector.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_
 
-#include "webrtc/modules/audio_coding/neteq/audio_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
 
 #include "gmock/gmock.h"
 
@@ -48,4 +48,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_

diff --git a/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h b/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h
similarity index 75%
rename from modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
rename to modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h
index d921066..8726551 100644
--- a/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
 
-#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
+#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
 
 #include "gmock/gmock.h"
 
@@ -34,4 +34,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_

diff --git a/modules/audio_coding/neteq/mock/mock_decoder_database.h b/modules/audio_coding/neteq4/mock/mock_decoder_database.h
similarity index 87%
rename from modules/audio_coding/neteq/mock/mock_decoder_database.h
rename to modules/audio_coding/neteq4/mock/mock_decoder_database.h
index 583fa54..c4ca25a 100644
--- a/modules/audio_coding/neteq/mock/mock_decoder_database.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_
 
-#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
 
 #include "gmock/gmock.h"
 
@@ -61,4 +61,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_

diff --git a/modules/audio_coding/neteq/mock/mock_delay_manager.h b/modules/audio_coding/neteq4/mock/mock_delay_manager.h
similarity index 86%
rename from modules/audio_coding/neteq/mock/mock_delay_manager.h
rename to modules/audio_coding/neteq4/mock/mock_delay_manager.h
index c21a1c2..1edfb87 100644
--- a/modules/audio_coding/neteq/mock/mock_delay_manager.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_
 
-#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
 
 #include "gmock/gmock.h"
 
@@ -60,4 +60,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_

diff --git a/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h b/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h
similarity index 76%
rename from modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
rename to modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h
index 26e0932..211b2b9 100644
--- a/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
 
-#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h"
 
 #include "gmock/gmock.h"
 
@@ -31,4 +31,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_

diff --git a/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h b/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h
similarity index 77%
rename from modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
rename to modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h
index 0351d6b..5a89db4 100644
--- a/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_
 
-#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h"
 
 #include "gmock/gmock.h"
 
@@ -35,4 +35,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_

diff --git a/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h b/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h
similarity index 74%
rename from modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
rename to modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h
index 3bed4d1..d34f747 100644
--- a/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
 
-#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
+#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
 
 #include "gmock/gmock.h"
 
@@ -32,4 +32,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_

diff --git a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h
similarity index 90%
rename from modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
rename to modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h
index 9522b53..b13affe 100644
--- a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
 
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 
 #include "gmock/gmock.h"
 #include "webrtc/base/constructormagic.h"
@@ -96,4 +96,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_

diff --git a/modules/audio_coding/neteq/mock/mock_packet_buffer.h b/modules/audio_coding/neteq4/mock/mock_packet_buffer.h
similarity index 85%
rename from modules/audio_coding/neteq/mock/mock_packet_buffer.h
rename to modules/audio_coding/neteq4/mock/mock_packet_buffer.h
index 2882248..b1d8ef9 100644
--- a/modules/audio_coding/neteq/mock/mock_packet_buffer.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_
 
-#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
 
 #include "gmock/gmock.h"
 
@@ -55,4 +55,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_

diff --git a/modules/audio_coding/neteq/mock/mock_payload_splitter.h b/modules/audio_coding/neteq4/mock/mock_payload_splitter.h
similarity index 80%
rename from modules/audio_coding/neteq/mock/mock_payload_splitter.h
rename to modules/audio_coding/neteq4/mock/mock_payload_splitter.h
index f166542..369dfc4 100644
--- a/modules/audio_coding/neteq/mock/mock_payload_splitter.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_
 
-#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
 
 #include "gmock/gmock.h"
 
@@ -36,4 +36,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_

diff --git a/modules/audio_coding/neteq/neteq.cc b/modules/audio_coding/neteq4/neteq.cc
similarity index 70%
rename from modules/audio_coding/neteq/neteq.cc
rename to modules/audio_coding/neteq4/neteq.cc
index 7edacde..48dacea 100644
--- a/modules/audio_coding/neteq/neteq.cc
+++ b/modules/audio_coding/neteq4/neteq.cc

@@ -8,21 +8,21 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/neteq.gypi b/modules/audio_coding/neteq4/neteq.gypi
similarity index 99%
rename from modules/audio_coding/neteq/neteq.gypi
rename to modules/audio_coding/neteq4/neteq.gypi
index 2b1524b..84794c9 100644
--- a/modules/audio_coding/neteq/neteq.gypi
+++ b/modules/audio_coding/neteq4/neteq.gypi

@@ -33,7 +33,7 @@
   },
   'targets': [
     {
-      'target_name': 'neteq',
+      'target_name': 'NetEq4',
       'type': 'static_library',
       'dependencies': [
         '<@(neteq_dependencies)',

diff --git a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc
similarity index 96%
rename from modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
rename to modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc
index a401076..3352d18 100644
--- a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
+++ b/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc

@@ -15,10 +15,10 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.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/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/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"

diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq4/neteq_impl.cc
similarity index 97%
rename from modules/audio_coding/neteq/neteq_impl.cc
rename to modules/audio_coding/neteq4/neteq_impl.cc
index 0054c8d..38a5456 100644
--- a/modules/audio_coding/neteq/neteq_impl.cc
+++ b/modules/audio_coding/neteq4/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/neteq/neteq_impl.h"
+#include "webrtc/modules/audio_coding/neteq4/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/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/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/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/logging.h"

diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq4/neteq_impl.h
similarity index 96%
rename from modules/audio_coding/neteq/neteq_impl.h
rename to modules/audio_coding/neteq4/neteq_impl.h
index 4ec6fa4..9b155fe 100644
--- a/modules/audio_coding/neteq/neteq_impl.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_NETEQ_IMPL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.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/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/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/thread_annotations.h"
 #include "webrtc/typedefs.h"
@@ -399,4 +399,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_

diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq4/neteq_impl_unittest.cc
similarity index 94%
rename from modules/audio_coding/neteq/neteq_impl_unittest.cc
rename to modules/audio_coding/neteq4/neteq_impl_unittest.cc
index 1257766..aedd8d5 100644
--- a/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/interface/neteq.h"
-#include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.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"
+#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"
 
 using ::testing::Return;
 using ::testing::ReturnNull;

diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq4/neteq_stereo_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/neteq_stereo_unittest.cc
rename to modules/audio_coding/neteq4/neteq_stereo_unittest.cc
index 3c695c8..e1d6441 100644
--- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc
+++ b/modules/audio_coding/neteq4/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/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/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/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"

diff --git a/modules/audio_coding/neteq/neteq_tests.gypi b/modules/audio_coding/neteq4/neteq_tests.gypi
similarity index 93%
rename from modules/audio_coding/neteq/neteq_tests.gypi
rename to modules/audio_coding/neteq4/neteq_tests.gypi
index 4d2ce25..2be4737 100644
--- a/modules/audio_coding/neteq/neteq_tests.gypi
+++ b/modules/audio_coding/neteq4/neteq_tests.gypi

@@ -12,8 +12,8 @@
       'target_name': 'neteq_rtpplay',
       'type': 'executable',
       'dependencies': [
-        'neteq',
-        'neteq_test_tools',
+        'NetEq4',
+        'NetEq4TestTools',
         '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.
-        'neteq_test_tools',# Test helpers
+        'NetEq4TestTools',# Test helpers
         'G711',
         'G722',
         'PCM16B',
@@ -99,7 +99,7 @@
       'target_name': 'RTPchange',
       'type': 'executable',
       'dependencies': [
-        'neteq_test_tools',
+        'NetEq4TestTools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -111,7 +111,7 @@
       'target_name': 'RTPtimeshift',
       'type': 'executable',
       'dependencies': [
-       'neteq_test_tools',
+       'NetEq4TestTools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -123,7 +123,7 @@
       'target_name': 'RTPcat',
       'type': 'executable',
       'dependencies': [
-        'neteq_test_tools',
+        'NetEq4TestTools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -135,7 +135,7 @@
       'target_name': 'rtp_to_text',
       'type': 'executable',
       'dependencies': [
-        'neteq_test_tools',
+        'NetEq4TestTools',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
@@ -147,7 +147,7 @@
       'target_name': 'audio_classifier_test',
       'type': 'executable',
       'dependencies': [
-        'neteq',
+        'NetEq4',
       ],
       'sources': [
         'test/audio_classifier_test.cc',
@@ -158,7 +158,7 @@
       'target_name': 'neteq_test_support',
       'type': 'static_library',
       'dependencies': [
-        'neteq',
+        'NetEq4',
         'PCM16B',
         'neteq_unittest_tools',
         '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -173,10 +173,10 @@
     }, # neteq_test_support
 
     {
-      'target_name': 'neteq_speed_test',
+      'target_name': 'neteq4_speed_test',
       'type': 'executable',
       'dependencies': [
-        'neteq',
+        'NetEq4',
         'neteq_test_support',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/test/test.gyp:test_support_main',
@@ -187,10 +187,10 @@
     },
 
     {
-      'target_name': 'neteq_opus_fec_quality_test',
+      'target_name': 'neteq4_opus_fec_quality_test',
       'type': 'executable',
       'dependencies': [
-        'neteq',
+        'NetEq4',
         'neteq_test_support',
         'webrtc_opus',
         '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -203,7 +203,7 @@
     },
 
     {
-     'target_name': 'neteq_test_tools',
+     'target_name': 'NetEq4TestTools',
       # Collection of useful functions used in other tests.
       'type': 'static_library',
       'variables': {

diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq4/neteq_unittest.cc
similarity index 99%
rename from modules/audio_coding/neteq/neteq_unittest.cc
rename to modules/audio_coding/neteq4/neteq_unittest.cc
index 62783ef..f66a3cf 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq4/neteq_unittest.cc

@@ -12,7 +12,7 @@
  * This file includes unit tests for NetEQ.
  */
 
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/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/neteq/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq4/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/modules/audio_coding/neteq/normal.cc b/modules/audio_coding/neteq4/normal.cc
similarity index 95%
rename from modules/audio_coding/neteq/normal.cc
rename to modules/audio_coding/neteq4/normal.cc
index bfde179..8d9c020 100644
--- a/modules/audio_coding/neteq/normal.cc
+++ b/modules/audio_coding/neteq4/normal.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq/normal.h"
+#include "webrtc/modules/audio_coding/neteq4/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/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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq4/normal.h
similarity index 87%
rename from modules/audio_coding/neteq/normal.h
rename to modules/audio_coding/neteq4/normal.h
index aa24b52..1be5c7f 100644
--- a/modules/audio_coding/neteq/normal.h
+++ b/modules/audio_coding/neteq4/normal.h

@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
 
 #include <string.h>  // Access to size_t.
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq/defines.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/defines.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -65,4 +65,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_

diff --git a/modules/audio_coding/neteq/normal_unittest.cc b/modules/audio_coding/neteq4/normal_unittest.cc
similarity index 71%
rename from modules/audio_coding/neteq/normal_unittest.cc
rename to modules/audio_coding/neteq4/normal_unittest.cc
index c855865..2bd7b89 100644
--- a/modules/audio_coding/neteq/normal_unittest.cc
+++ b/modules/audio_coding/neteq4/normal_unittest.cc

@@ -10,16 +10,16 @@
 
 // Unit tests for Normal class.
 
-#include "webrtc/modules/audio_coding/neteq/normal.h"
+#include "webrtc/modules/audio_coding/neteq4/normal.h"
 
 #include <vector>
 
 #include "gtest/gtest.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"
+#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"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/packet.h b/modules/audio_coding/neteq4/packet.h
similarity index 95%
rename from modules/audio_coding/neteq/packet.h
rename to modules/audio_coding/neteq4/packet.h
index 89ddda7..4518f91 100644
--- a/modules/audio_coding/neteq/packet.h
+++ b/modules/audio_coding/neteq4/packet.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_
 
 #include <list>
 
@@ -85,4 +85,4 @@
 typedef std::list<Packet*> PacketList;
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_

diff --git a/modules/audio_coding/neteq/packet_buffer.cc b/modules/audio_coding/neteq4/packet_buffer.cc
similarity index 97%
rename from modules/audio_coding/neteq/packet_buffer.cc
rename to modules/audio_coding/neteq4/packet_buffer.cc
index 38b573b..bcd0e7b 100644
--- a/modules/audio_coding/neteq/packet_buffer.cc
+++ b/modules/audio_coding/neteq4/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/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
 
 #include <algorithm>  // find_if()
 
-#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq4/packet_buffer.h
similarity index 95%
rename from modules/audio_coding/neteq/packet_buffer.h
rename to modules/audio_coding/neteq4/packet_buffer.h
index 76c4ddd..3b068c3 100644
--- a/modules/audio_coding/neteq/packet_buffer.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_PACKET_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -132,4 +132,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_

diff --git a/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq4/packet_buffer_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/packet_buffer_unittest.cc
rename to modules/audio_coding/neteq4/packet_buffer_unittest.cc
index 5e6b89f..387ca14 100644
--- a/modules/audio_coding/neteq/packet_buffer_unittest.cc
+++ b/modules/audio_coding/neteq4/packet_buffer_unittest.cc

@@ -10,12 +10,12 @@
 
 // Unit tests for PacketBuffer class.
 
-#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 
 using ::testing::Return;
 using ::testing::_;

diff --git a/modules/audio_coding/neteq/payload_splitter.cc b/modules/audio_coding/neteq4/payload_splitter.cc
similarity index 98%
rename from modules/audio_coding/neteq/payload_splitter.cc
rename to modules/audio_coding/neteq4/payload_splitter.cc
index 1d61ef0..0e97b7d 100644
--- a/modules/audio_coding/neteq/payload_splitter.cc
+++ b/modules/audio_coding/neteq4/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/neteq/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
 
 #include <assert.h>
 
-#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/payload_splitter.h b/modules/audio_coding/neteq4/payload_splitter.h
similarity index 93%
rename from modules/audio_coding/neteq/payload_splitter.h
rename to modules/audio_coding/neteq4/payload_splitter.h
index a3dd77e..5086409 100644
--- a/modules/audio_coding/neteq/payload_splitter.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_PAYLOAD_SPLITTER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 
 namespace webrtc {
 
@@ -87,4 +87,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_

diff --git a/modules/audio_coding/neteq/payload_splitter_unittest.cc b/modules/audio_coding/neteq4/payload_splitter_unittest.cc
similarity index 99%
rename from modules/audio_coding/neteq/payload_splitter_unittest.cc
rename to modules/audio_coding/neteq4/payload_splitter_unittest.cc
index 5cde1bd..c83a9b5 100644
--- a/modules/audio_coding/neteq/payload_splitter_unittest.cc
+++ b/modules/audio_coding/neteq4/payload_splitter_unittest.cc

@@ -10,15 +10,15 @@
 
 // Unit tests for PayloadSplitter class.
 
-#include "webrtc/modules/audio_coding/neteq/payload_splitter.h"
+#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h"
 
 #include <assert.h>
 
 #include <utility>  // pair
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 using ::testing::Return;

diff --git a/modules/audio_coding/neteq/post_decode_vad.cc b/modules/audio_coding/neteq4/post_decode_vad.cc
similarity index 97%
rename from modules/audio_coding/neteq/post_decode_vad.cc
rename to modules/audio_coding/neteq4/post_decode_vad.cc
index 7ae7f97..c3d5c7e 100644
--- a/modules/audio_coding/neteq/post_decode_vad.cc
+++ b/modules/audio_coding/neteq4/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/neteq/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq4/post_decode_vad.h
similarity index 82%
rename from modules/audio_coding/neteq/post_decode_vad.h
rename to modules/audio_coding/neteq4/post_decode_vad.h
index e713009..327de1a 100644
--- a/modules/audio_coding/neteq/post_decode_vad.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_POST_DECODE_VAD_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_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/neteq/defines.h"
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#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/typedefs.h"
 
 namespace webrtc {
@@ -69,4 +69,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_

diff --git a/modules/audio_coding/neteq/post_decode_vad_unittest.cc b/modules/audio_coding/neteq4/post_decode_vad_unittest.cc
similarity index 90%
rename from modules/audio_coding/neteq/post_decode_vad_unittest.cc
rename to modules/audio_coding/neteq4/post_decode_vad_unittest.cc
index ed48db8..a4d9da8 100644
--- a/modules/audio_coding/neteq/post_decode_vad_unittest.cc
+++ b/modules/audio_coding/neteq4/post_decode_vad_unittest.cc

@@ -10,7 +10,7 @@
 
 // Unit tests for PostDecodeVad class.
 
-#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h"
+#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h"
 
 #include "gtest/gtest.h"
 

diff --git a/modules/audio_coding/neteq/preemptive_expand.cc b/modules/audio_coding/neteq4/preemptive_expand.cc
similarity index 98%
rename from modules/audio_coding/neteq/preemptive_expand.cc
rename to modules/audio_coding/neteq4/preemptive_expand.cc
index b2dc3e6..dace45e 100644
--- a/modules/audio_coding/neteq/preemptive_expand.cc
+++ b/modules/audio_coding/neteq4/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/neteq/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
 
 #include <algorithm>  // min, max
 

diff --git a/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq4/preemptive_expand.h
similarity index 89%
rename from modules/audio_coding/neteq/preemptive_expand.h
rename to modules/audio_coding/neteq4/preemptive_expand.h
index 1aa6133..4d20ae6 100644
--- a/modules/audio_coding/neteq/preemptive_expand.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_PREEMPTIVE_EXPAND_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
-#include "webrtc/modules/audio_coding/neteq/time_stretch.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -84,4 +84,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_

diff --git a/modules/audio_coding/neteq/random_vector.cc b/modules/audio_coding/neteq4/random_vector.cc
similarity index 97%
rename from modules/audio_coding/neteq/random_vector.cc
rename to modules/audio_coding/neteq4/random_vector.cc
index b12f217..e7a5a1d 100644
--- a/modules/audio_coding/neteq/random_vector.cc
+++ b/modules/audio_coding/neteq4/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/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/random_vector.h b/modules/audio_coding/neteq4/random_vector.h
similarity index 86%
rename from modules/audio_coding/neteq/random_vector.h
rename to modules/audio_coding/neteq4/random_vector.h
index 767dc48..2c67ebb 100644
--- a/modules/audio_coding/neteq/random_vector.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_RANDOM_VECTOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
 
 #include <string.h>  // size_t
 
@@ -47,4 +47,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_

diff --git a/modules/audio_coding/neteq/random_vector_unittest.cc b/modules/audio_coding/neteq4/random_vector_unittest.cc
similarity index 90%
rename from modules/audio_coding/neteq/random_vector_unittest.cc
rename to modules/audio_coding/neteq4/random_vector_unittest.cc
index cbdcdf7..83193e2 100644
--- a/modules/audio_coding/neteq/random_vector_unittest.cc
+++ b/modules/audio_coding/neteq4/random_vector_unittest.cc

@@ -10,7 +10,7 @@
 
 // Unit tests for RandomVector class.
 
-#include "webrtc/modules/audio_coding/neteq/random_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
 
 #include "gtest/gtest.h"
 

diff --git a/modules/audio_coding/neteq/rtcp.cc b/modules/audio_coding/neteq4/rtcp.cc
similarity index 98%
rename from modules/audio_coding/neteq/rtcp.cc
rename to modules/audio_coding/neteq4/rtcp.cc
index cf8e028..bc178fc 100644
--- a/modules/audio_coding/neteq/rtcp.cc
+++ b/modules/audio_coding/neteq4/rtcp.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_coding/neteq/rtcp.h"
+#include "webrtc/modules/audio_coding/neteq4/rtcp.h"
 
 #include <string.h>
 

diff --git a/modules/audio_coding/neteq/rtcp.h b/modules/audio_coding/neteq4/rtcp.h
similarity index 89%
rename from modules/audio_coding/neteq/rtcp.h
rename to modules/audio_coding/neteq4/rtcp.h
index 2a765ef..d465667 100644
--- a/modules/audio_coding/neteq/rtcp.h
+++ b/modules/audio_coding/neteq4/rtcp.h

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -55,4 +55,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_

diff --git a/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq4/statistics_calculator.cc
similarity index 96%
rename from modules/audio_coding/neteq/statistics_calculator.cc
rename to modules/audio_coding/neteq4/statistics_calculator.cc
index 383f705..b6e9222 100644
--- a/modules/audio_coding/neteq/statistics_calculator.cc
+++ b/modules/audio_coding/neteq4/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/neteq/statistics_calculator.h"
+#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
 
 #include <assert.h>
 #include <string.h>  // memset
 
-#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
-#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
+#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq4/statistics_calculator.h
similarity index 92%
rename from modules/audio_coding/neteq/statistics_calculator.h
rename to modules/audio_coding/neteq4/statistics_calculator.h
index 07ef853..30f9377 100644
--- a/modules/audio_coding/neteq/statistics_calculator.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_STATISTICS_CALCULATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_
 
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -106,4 +106,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_

diff --git a/modules/audio_coding/neteq/sync_buffer.cc b/modules/audio_coding/neteq4/sync_buffer.cc
similarity index 98%
rename from modules/audio_coding/neteq/sync_buffer.cc
rename to modules/audio_coding/neteq4/sync_buffer.cc
index d1802e1..75ee6ec 100644
--- a/modules/audio_coding/neteq/sync_buffer.cc
+++ b/modules/audio_coding/neteq4/sync_buffer.cc

@@ -12,7 +12,7 @@
 
 #include <algorithm>  // Access to min.
 
-#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq4/sync_buffer.h
similarity index 94%
rename from modules/audio_coding/neteq/sync_buffer.h
rename to modules/audio_coding/neteq4/sync_buffer.h
index 59bd4d8..8deb950 100644
--- a/modules/audio_coding/neteq/sync_buffer.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_SYNC_BUFFER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -98,4 +98,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_

diff --git a/modules/audio_coding/neteq/sync_buffer_unittest.cc b/modules/audio_coding/neteq4/sync_buffer_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/sync_buffer_unittest.cc
rename to modules/audio_coding/neteq4/sync_buffer_unittest.cc
index 1a3d0fe..1aafa22 100644
--- a/modules/audio_coding/neteq/sync_buffer_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/sync_buffer.h"
+#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h"
 
 #include "gtest/gtest.h"
 

diff --git a/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc b/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc
similarity index 100%
rename from modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc
rename to modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc


diff --git a/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h b/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h
similarity index 100%
rename from modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h
rename to modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h


diff --git a/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc b/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc
similarity index 100%
rename from modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc
rename to modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc


diff --git a/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h b/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h
similarity index 100%
rename from modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h
rename to modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h


diff --git a/modules/audio_coding/neteq/test/PayloadTypes.h b/modules/audio_coding/neteq4/test/PayloadTypes.h
similarity index 100%
rename from modules/audio_coding/neteq/test/PayloadTypes.h
rename to modules/audio_coding/neteq4/test/PayloadTypes.h


diff --git a/modules/audio_coding/neteq/test/RTPcat.cc b/modules/audio_coding/neteq4/test/RTPcat.cc
similarity index 96%
rename from modules/audio_coding/neteq/test/RTPcat.cc
rename to modules/audio_coding/neteq4/test/RTPcat.cc
index f06b574..87189cf 100644
--- a/modules/audio_coding/neteq/test/RTPcat.cc
+++ b/modules/audio_coding/neteq4/test/RTPcat.cc

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h"
 
 #define FIRSTLINELEN 40
 

diff --git a/modules/audio_coding/neteq/test/RTPchange.cc b/modules/audio_coding/neteq4/test/RTPchange.cc
similarity index 95%
rename from modules/audio_coding/neteq/test/RTPchange.cc
rename to modules/audio_coding/neteq4/test/RTPchange.cc
index 54395c0..30bee86 100644
--- a/modules/audio_coding/neteq/test/RTPchange.cc
+++ b/modules/audio_coding/neteq4/test/RTPchange.cc

@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h"
-#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h"
+#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h"
 
 #define FIRSTLINELEN 40
 //#define WEBRTC_DUMMY_RTP

diff --git a/modules/audio_coding/neteq/test/RTPencode.cc b/modules/audio_coding/neteq4/test/RTPencode.cc
similarity index 99%
rename from modules/audio_coding/neteq/test/RTPencode.cc
rename to modules/audio_coding/neteq4/test/RTPencode.cc
index 93b366b..bc80609 100644
--- a/modules/audio_coding/neteq/test/RTPencode.cc
+++ b/modules/audio_coding/neteq4/test/RTPencode.cc

@@ -25,8 +25,8 @@
 
 #include "webrtc/typedefs.h"
 // needed for NetEqDecoder
-#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
-#include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
+#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
 
 /************************/
 /* Define payload types */

diff --git a/modules/audio_coding/neteq/test/RTPjitter.cc b/modules/audio_coding/neteq4/test/RTPjitter.cc
similarity index 100%
rename from modules/audio_coding/neteq/test/RTPjitter.cc
rename to modules/audio_coding/neteq4/test/RTPjitter.cc


diff --git a/modules/audio_coding/neteq/test/RTPtimeshift.cc b/modules/audio_coding/neteq4/test/RTPtimeshift.cc
similarity index 100%
rename from modules/audio_coding/neteq/test/RTPtimeshift.cc
rename to modules/audio_coding/neteq4/test/RTPtimeshift.cc


diff --git a/modules/audio_coding/neteq/test/audio_classifier_test.cc b/modules/audio_coding/neteq4/test/audio_classifier_test.cc
similarity index 97%
rename from modules/audio_coding/neteq/test/audio_classifier_test.cc
rename to modules/audio_coding/neteq4/test/audio_classifier_test.cc
index aa2b61d..730406b 100644
--- a/modules/audio_coding/neteq/test/audio_classifier_test.cc
+++ b/modules/audio_coding/neteq4/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/neteq/audio_classifier.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h"
 
 #include <math.h>
 #include <stdio.h>

diff --git a/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m b/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m
similarity index 100%
rename from modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m
rename to modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m


diff --git a/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m b/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m
similarity index 100%
rename from modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m
rename to modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m


diff --git a/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc b/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc
similarity index 98%
rename from modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc
rename to modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc
index ad6d8ec..aa4522b 100644
--- a/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc
+++ b/modules/audio_coding/neteq4/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/neteq/tools/neteq_quality_test.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 using google::RegisterFlagValidator;

diff --git a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc
similarity index 95%
rename from modules/audio_coding/neteq/test/neteq_performance_unittest.cc
rename to modules/audio_coding/neteq4/test/neteq_performance_unittest.cc
index 14857c7..f669742 100644
--- a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
+++ b/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc

@@ -9,7 +9,7 @@
  */
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h"
 #include "webrtc/test/testsupport/perf_test.h"
 #include "webrtc/typedefs.h"
 

diff --git a/modules/audio_coding/neteq/test/neteq_speed_test.cc b/modules/audio_coding/neteq4/test/neteq_speed_test.cc
similarity index 97%
rename from modules/audio_coding/neteq/test/neteq_speed_test.cc
rename to modules/audio_coding/neteq4/test/neteq_speed_test.cc
index 05e75f3..cecd48b 100644
--- a/modules/audio_coding/neteq/test/neteq_speed_test.cc
+++ b/modules/audio_coding/neteq4/test/neteq_speed_test.cc

@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include "gflags/gflags.h"
-#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h"
 #include "webrtc/typedefs.h"
 
 // Flag validators.

diff --git a/modules/audio_coding/neteq/test/rtp_to_text.cc b/modules/audio_coding/neteq4/test/rtp_to_text.cc
similarity index 100%
rename from modules/audio_coding/neteq/test/rtp_to_text.cc
rename to modules/audio_coding/neteq4/test/rtp_to_text.cc


diff --git a/modules/audio_coding/neteq/time_stretch.cc b/modules/audio_coding/neteq4/time_stretch.cc
similarity index 97%
rename from modules/audio_coding/neteq/time_stretch.cc
rename to modules/audio_coding/neteq4/time_stretch.cc
index a9228d4..5b246c1 100644
--- a/modules/audio_coding/neteq/time_stretch.cc
+++ b/modules/audio_coding/neteq4/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/neteq/time_stretch.h"
+#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
 
 #include <algorithm>  // min, max
 
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/neteq/background_noise.h"
-#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
+#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/time_stretch.h b/modules/audio_coding/neteq4/time_stretch.h
similarity index 93%
rename from modules/audio_coding/neteq/time_stretch.h
rename to modules/audio_coding/neteq4/time_stretch.h
index 9396d8f..cd110b1 100644
--- a/modules/audio_coding/neteq/time_stretch.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TIME_STRETCH_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
 
 #include <assert.h>
 #include <string.h>  // memset, size_t
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -108,4 +108,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_

diff --git a/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq4/time_stretch_unittest.cc
similarity index 89%
rename from modules/audio_coding/neteq/time_stretch_unittest.cc
rename to modules/audio_coding/neteq4/time_stretch_unittest.cc
index 64789b4..529038a 100644
--- a/modules/audio_coding/neteq/time_stretch_unittest.cc
+++ b/modules/audio_coding/neteq4/time_stretch_unittest.cc

@@ -10,11 +10,11 @@
 
 // Unit tests for Accelerate and PreemptiveExpand classes.
 
-#include "webrtc/modules/audio_coding/neteq/accelerate.h"
-#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
+#include "webrtc/modules/audio_coding/neteq4/accelerate.h"
+#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h"
 
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/background_noise.h"
+#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
 
 namespace webrtc {
 

diff --git a/modules/audio_coding/neteq/timestamp_scaler.cc b/modules/audio_coding/neteq4/timestamp_scaler.cc
similarity index 94%
rename from modules/audio_coding/neteq/timestamp_scaler.cc
rename to modules/audio_coding/neteq4/timestamp_scaler.cc
index 0189013..b2b5b40 100644
--- a/modules/audio_coding/neteq/timestamp_scaler.cc
+++ b/modules/audio_coding/neteq4/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/neteq/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
 
-#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/defines.h"
+#include "webrtc/modules/audio_coding/neteq4/decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/defines.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/timestamp_scaler.h b/modules/audio_coding/neteq4/timestamp_scaler.h
similarity index 88%
rename from modules/audio_coding/neteq/timestamp_scaler.h
rename to modules/audio_coding/neteq4/timestamp_scaler.h
index 59b8cc7..604b599 100644
--- a/modules/audio_coding/neteq/timestamp_scaler.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TIMESTAMP_SCALER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -65,4 +65,4 @@
 };
 
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_

diff --git a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/timestamp_scaler_unittest.cc
rename to modules/audio_coding/neteq4/timestamp_scaler_unittest.cc
index 8cbbfa3..c676094 100644
--- a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
+++ b/modules/audio_coding/neteq4/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/neteq/timestamp_scaler.h"
+#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
-#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h"
+#include "webrtc/modules/audio_coding/neteq4/packet.h"
 
 using ::testing::Return;
 using ::testing::ReturnNull;

diff --git a/modules/audio_coding/neteq/tools/audio_loop.cc b/modules/audio_coding/neteq4/tools/audio_loop.cc
similarity index 96%
rename from modules/audio_coding/neteq/tools/audio_loop.cc
rename to modules/audio_coding/neteq4/tools/audio_loop.cc
index 2d2a7e3..94ea5be 100644
--- a/modules/audio_coding/neteq/tools/audio_loop.cc
+++ b/modules/audio_coding/neteq4/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/neteq/tools/audio_loop.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h"
 
 #include <assert.h>
 #include <stdio.h>

diff --git a/modules/audio_coding/neteq/tools/audio_loop.h b/modules/audio_coding/neteq4/tools/audio_loop.h
similarity index 90%
rename from modules/audio_coding/neteq/tools/audio_loop.h
rename to modules/audio_coding/neteq4/tools/audio_loop.h
index 9647d82..144898e 100644
--- a/modules/audio_coding/neteq/tools/audio_loop.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_AUDIO_LOOP_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_

diff --git a/modules/audio_coding/neteq/tools/input_audio_file.cc b/modules/audio_coding/neteq4/tools/input_audio_file.cc
similarity index 95%
rename from modules/audio_coding/neteq/tools/input_audio_file.cc
rename to modules/audio_coding/neteq4/tools/input_audio_file.cc
index 8063173..62692e2 100644
--- a/modules/audio_coding/neteq/tools/input_audio_file.cc
+++ b/modules/audio_coding/neteq4/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/neteq/tools/input_audio_file.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
 
 namespace webrtc {
 namespace test {

diff --git a/modules/audio_coding/neteq/tools/input_audio_file.h b/modules/audio_coding/neteq4/tools/input_audio_file.h
similarity index 88%
rename from modules/audio_coding/neteq/tools/input_audio_file.h
rename to modules/audio_coding/neteq4/tools/input_audio_file.h
index 274f8ea..7325d04 100644
--- a/modules/audio_coding/neteq/tools/input_audio_file.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
 
 #include <stdio.h>
 
@@ -48,4 +48,4 @@
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_

diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq4/tools/neteq_performance_test.cc
similarity index 94%
rename from modules/audio_coding/neteq/tools/neteq_performance_test.cc
rename to modules/audio_coding/neteq4/tools/neteq_performance_test.cc
index 433546f..2eb7462 100644
--- a/modules/audio_coding/neteq/tools/neteq_performance_test.cc
+++ b/modules/audio_coding/neteq4/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/neteq/tools/neteq_performance_test.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h"
 
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.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/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/system_wrappers/interface/clock.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/typedefs.h"

diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.h b/modules/audio_coding/neteq4/tools/neteq_performance_test.h
similarity index 80%
rename from modules/audio_coding/neteq/tools/neteq_performance_test.h
rename to modules/audio_coding/neteq4/tools/neteq_performance_test.h
index d094db0..1b205c0 100644
--- a/modules/audio_coding/neteq/tools/neteq_performance_test.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_
 
 #include "webrtc/typedefs.h"
 
@@ -29,4 +29,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_

diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq4/tools/neteq_quality_test.cc
similarity index 97%
rename from modules/audio_coding/neteq/tools/neteq_quality_test.cc
rename to modules/audio_coding/neteq4/tools/neteq_quality_test.cc
index fc5d8ab..8daca18 100644
--- a/modules/audio_coding/neteq/tools/neteq_quality_test.cc
+++ b/modules/audio_coding/neteq4/tools/neteq_quality_test.cc

@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h"
 
 namespace webrtc {
 namespace test {

diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq4/tools/neteq_quality_test.h
similarity index 87%
rename from modules/audio_coding/neteq/tools/neteq_quality_test.h
rename to modules/audio_coding/neteq4/tools/neteq_quality_test.h
index 87fc507..03aabc8 100644
--- a/modules/audio_coding/neteq/tools/neteq_quality_test.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_
 
 #include <string>
 #include "testing/gtest/include/gtest/gtest.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/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/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
@@ -97,4 +97,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_

diff --git a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
similarity index 98%
rename from modules/audio_coding/neteq/tools/neteq_rtpplay.cc
rename to modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
index 3c5f6b0..1308bf5 100644
--- a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
+++ b/modules/audio_coding/neteq4/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/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/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/interface/module_common_types.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/trace.h"

diff --git a/modules/audio_coding/neteq/tools/packet.cc b/modules/audio_coding/neteq4/tools/packet.cc
similarity index 98%
rename from modules/audio_coding/neteq/tools/packet.cc
rename to modules/audio_coding/neteq4/tools/packet.cc
index d8fb713..6e0778b 100644
--- a/modules/audio_coding/neteq/tools/packet.cc
+++ b/modules/audio_coding/neteq4/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/neteq/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/tools/packet.h b/modules/audio_coding/neteq4/tools/packet.h
similarity index 95%
rename from modules/audio_coding/neteq/tools/packet.h
rename to modules/audio_coding/neteq4/tools/packet.h
index eb8ce28..03586bc 100644
--- a/modules/audio_coding/neteq/tools/packet.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_PACKET_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_
 
 #include <list>
 
@@ -114,4 +114,4 @@
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_

diff --git a/modules/audio_coding/neteq/tools/packet_source.h b/modules/audio_coding/neteq4/tools/packet_source.h
similarity index 80%
rename from modules/audio_coding/neteq/tools/packet_source.h
rename to modules/audio_coding/neteq4/tools/packet_source.h
index c539b8e..261ae78 100644
--- a/modules/audio_coding/neteq/tools/packet_source.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_PACKET_SOURCE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
 
 #include "webrtc/base/constructormagic.h"
 
@@ -33,4 +33,4 @@
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_

diff --git a/modules/audio_coding/neteq/tools/packet_unittest.cc b/modules/audio_coding/neteq4/tools/packet_unittest.cc
similarity index 98%
rename from modules/audio_coding/neteq/tools/packet_unittest.cc
rename to modules/audio_coding/neteq4/tools/packet_unittest.cc
index df844ee..b6c0713 100644
--- a/modules/audio_coding/neteq/tools/packet_unittest.cc
+++ b/modules/audio_coding/neteq4/tools/packet_unittest.cc

@@ -10,7 +10,7 @@
 
 // Unit tests for test Packet class.
 
-#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
 
 #include "gtest/gtest.h"
 

diff --git a/modules/audio_coding/neteq/tools/rtp_analyze.cc b/modules/audio_coding/neteq4/tools/rtp_analyze.cc
similarity index 97%
rename from modules/audio_coding/neteq/tools/rtp_analyze.cc
rename to modules/audio_coding/neteq4/tools/rtp_analyze.cc
index 773cc2c..71a6c3c 100644
--- a/modules/audio_coding/neteq/tools/rtp_analyze.cc
+++ b/modules/audio_coding/neteq4/tools/rtp_analyze.cc

@@ -13,8 +13,8 @@
 #include <vector>
 
 #include "google/gflags.h"
-#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
-#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 // Flag validator.

diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.cc b/modules/audio_coding/neteq4/tools/rtp_file_source.cc
similarity index 96%
rename from modules/audio_coding/neteq/tools/rtp_file_source.cc
rename to modules/audio_coding/neteq4/tools/rtp_file_source.cc
index 8278635..ceedde0 100644
--- a/modules/audio_coding/neteq/tools/rtp_file_source.cc
+++ b/modules/audio_coding/neteq4/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/neteq/tools/rtp_file_source.h"
+#include "webrtc/modules/audio_coding/neteq4/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/neteq/tools/packet.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/packet.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
 
 namespace webrtc {

diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.h b/modules/audio_coding/neteq4/tools/rtp_file_source.h
similarity index 86%
rename from modules/audio_coding/neteq/tools/rtp_file_source.h
rename to modules/audio_coding/neteq4/tools/rtp_file_source.h
index 527018e..86197d9 100644
--- a/modules/audio_coding/neteq/tools/rtp_file_source.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_RTP_FILE_SOURCE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_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/neteq/tools/packet_source.h"
+#include "webrtc/modules/audio_coding/neteq4/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 @@
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_

diff --git a/modules/audio_coding/neteq/tools/rtp_generator.cc b/modules/audio_coding/neteq4/tools/rtp_generator.cc
similarity index 95%
rename from modules/audio_coding/neteq/tools/rtp_generator.cc
rename to modules/audio_coding/neteq4/tools/rtp_generator.cc
index 17ac209..8d9a89d 100644
--- a/modules/audio_coding/neteq/tools/rtp_generator.cc
+++ b/modules/audio_coding/neteq4/tools/rtp_generator.cc

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
+#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h"
 
 namespace webrtc {
 namespace test {

diff --git a/modules/audio_coding/neteq/tools/rtp_generator.h b/modules/audio_coding/neteq4/tools/rtp_generator.h
similarity index 89%
rename from modules/audio_coding/neteq/tools/rtp_generator.h
rename to modules/audio_coding/neteq4/tools/rtp_generator.h
index d3824c8..e1fe802 100644
--- a/modules/audio_coding/neteq/tools/rtp_generator.h
+++ b/modules/audio_coding/neteq4/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_NETEQ_TOOLS_RTP_GENERATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
+#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_
+#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/interface/module_common_types.h"
@@ -54,4 +54,4 @@
 
 }  // namespace test
 }  // namespace webrtc
-#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
+#endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_

diff --git a/modules/modules.gyp b/modules/modules.gyp
index 9c10e38..10fa7ba 100644
--- a/modules/modules.gyp
+++ b/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/neteq/neteq.gypi',
+    'audio_coding/neteq4/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',
-            'neteq',
-            'neteq_test_tools',
+            'NetEq4',
+            'NetEq4TestTools',
             '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/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_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_processing/aec/system_delay_unittest.cc',
             'audio_processing/aec/echo_cancellation_unittest.cc',
             'audio_processing/echo_cancellation_impl_unittest.cc',

diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi
index 8f7ecb4..6373458 100644
--- a/webrtc_tests.gypi
+++ b/webrtc_tests.gypi

@@ -63,7 +63,7 @@
       'target_name': 'webrtc_perf_tests',
       'type': '<(gtest_target_type)',
       'sources': [
-        'modules/audio_coding/neteq/test/neteq_performance_unittest.cc',
+        'modules/audio_coding/neteq4/test/neteq_performance_unittest.cc',
         'video/call_perf_tests.cc',
         'video/full_stack.cc',
         'video/rampup_tests.cc',
commit	81f6488b6089d80da9aad6f71969276ec6268663	[log] [tgz]
author	henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>	Wed May 28 07:33:39 2014
committer	henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>	Wed May 28 07:33:39 2014
tree	4ceb6f77d40f46ce53eb718a5b04b5906bec282d
parent	1bdf186e6ae8d2f1a7d055237a75c0d7fd189624 [diff]