Remove vp9_ prefix from vp10 files

Remove the vp9_ prefix from vp10 file names.

Change-Id: I513a211b286a57d6126fc1b0fbfd6405120014f1

179 files changed, 694 insertions, 694 deletions

diff --git a/vp10/common/vp9_alloccommon.c b/vp10/common/alloccommon.c
index a5992c25a..e554f100c 100644
--- a/vp10/common/vp9_alloccommon.c
+++ b/vp10/common/alloccommon.c
@@ -11,12 +11,12 @@
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/systemdependent.h"
 
 void vp10_set_mb_mi(VP9_COMMON *cm, int width, int height) {
   const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);
diff --git a/vp10/common/vp9_alloccommon.h b/vp10/common/alloccommon.h
index e2df9e424..e2df9e424 100644
--- a/vp10/common/vp9_alloccommon.h
+++ b/vp10/common/alloccommon.h
diff --git a/vp10/common/arm/neon/vp9_iht4x4_add_neon.c b/vp10/common/arm/neon/iht4x4_add_neon.c
index 9061dac83..bd3e8b30f 100644
--- a/vp10/common/arm/neon/vp9_iht4x4_add_neon.c
+++ b/vp10/common/arm/neon/iht4x4_add_neon.c
@@ -13,7 +13,7 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 static int16_t sinpi_1_9 = 0x14a3;
 static int16_t sinpi_2_9 = 0x26c9;
diff --git a/vp10/common/arm/neon/vp9_iht8x8_add_neon.c b/vp10/common/arm/neon/iht8x8_add_neon.c
index 9907df782..82d7ccc61 100644
--- a/vp10/common/arm/neon/vp9_iht8x8_add_neon.c
+++ b/vp10/common/arm/neon/iht8x8_add_neon.c
@@ -13,7 +13,7 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 static int16_t cospi_2_64 = 16305;
 static int16_t cospi_4_64 = 16069;
diff --git a/vp10/common/vp9_blockd.c b/vp10/common/blockd.c
index c96142370..5394b5e0e 100644
--- a/vp10/common/vp9_blockd.c
+++ b/vp10/common/blockd.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 PREDICTION_MODE vp10_left_block_mode(const MODE_INFO *cur_mi,
                                     const MODE_INFO *left_mi, int b) {
diff --git a/vp10/common/vp9_blockd.h b/vp10/common/blockd.h
index c4d98b9ce..6173a9625 100644
--- a/vp10/common/vp9_blockd.h
+++ b/vp10/common/blockd.h
@@ -17,13 +17,13 @@
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp10/common/vp9_common_data.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_mv.h"
-#include "vp10/common/vp9_scale.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/common_data.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/mv.h"
+#include "vp10/common/scale.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_common.h b/vp10/common/common.h
index 9ef03a79a..cccf7c229 100644
--- a/vp10/common/vp9_common.h
+++ b/vp10/common/common.h
@@ -19,7 +19,7 @@
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/systemdependent.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_common_data.c b/vp10/common/common_data.c
index 2abe2c345..e8055550d 100644
--- a/vp10/common/vp9_common_data.c
+++ b/vp10/common/common_data.c
@@ -8,6 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_common_data.h"
+#include "vp10/common/common_data.h"
 
 
diff --git a/vp10/common/vp9_common_data.h b/vp10/common/common_data.h
index 5b29d2832..0fe129833 100644
--- a/vp10/common/vp9_common_data.h
+++ b/vp10/common/common_data.h
@@ -11,7 +11,7 @@
 #ifndef VP9_COMMON_VP9_COMMON_DATA_H_
 #define VP9_COMMON_VP9_COMMON_DATA_H_
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx/vpx_integer.h"
 
 #ifdef __cplusplus
diff --git a/vp10/common/vp9_debugmodes.c b/vp10/common/debugmodes.c
index d4858eaae..4c927d8d7 100644
--- a/vp10/common/vp9_debugmodes.c
+++ b/vp10/common/debugmodes.c
@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/onyxc_int.h"
 
 static void log_frame_info(VP9_COMMON *cm, const char *str, FILE *f) {
   fprintf(f, "%s", str);
diff --git a/vp10/common/vp9_entropy.c b/vp10/common/entropy.c
index 2277cdacc..ab1f0b26e 100644
--- a/vp10/common/vp9_entropy.c
+++ b/vp10/common/entropy.c
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_entropymode.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/entropymode.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx/vpx_integer.h"
 
diff --git a/vp10/common/vp9_entropy.h b/vp10/common/entropy.h
index 7859ace63..e95d8c418 100644
--- a/vp10/common/vp9_entropy.h
+++ b/vp10/common/entropy.h
@@ -14,8 +14,8 @@
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/prob.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/common.h"
+#include "vp10/common/enums.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_entropymode.c b/vp10/common/entropymode.c
index a19554aff..cd68d5b86 100644
--- a/vp10/common/vp9_entropymode.c
+++ b/vp10/common/entropymode.c
@@ -10,8 +10,8 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/seg_common.h"
 
 const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] = {
   {  // above = dc
diff --git a/vp10/common/vp9_entropymode.h b/vp10/common/entropymode.h
index 79fb7b914..391dcf32f 100644
--- a/vp10/common/vp9_entropymode.h
+++ b/vp10/common/entropymode.h
@@ -11,9 +11,9 @@
 #ifndef VP9_COMMON_VP9_ENTROPYMODE_H_
 #define VP9_COMMON_VP9_ENTROPYMODE_H_
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/filter.h"
 #include "vpx_dsp/vpx_filter.h"
 
 #ifdef __cplusplus
diff --git a/vp10/common/vp9_entropymv.c b/vp10/common/entropymv.c
index 6db282b6c..3d765a625 100644
--- a/vp10/common/vp9_entropymv.c
+++ b/vp10/common/entropymv.c
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_entropymv.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/entropymv.h"
 
 // Integer pel reference mv threshold for use of high-precision 1/8 mv
 #define COMPANDED_MVREF_THRESH 8
diff --git a/vp10/common/vp9_entropymv.h b/vp10/common/entropymv.h
index b03a5fbf1..a6c12d14c 100644
--- a/vp10/common/vp9_entropymv.h
+++ b/vp10/common/entropymv.h
@@ -16,7 +16,7 @@
 
 #include "vpx_dsp/prob.h"
 
-#include "vp10/common/vp9_mv.h"
+#include "vp10/common/mv.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_enums.h b/vp10/common/enums.h
index d089f23f9..d089f23f9 100644
--- a/vp10/common/vp9_enums.h
+++ b/vp10/common/enums.h
diff --git a/vp10/common/vp9_filter.c b/vp10/common/filter.c
index 97eb82f9b..dda279f13 100644
--- a/vp10/common/vp9_filter.c
+++ b/vp10/common/filter.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/filter.h"
 
 DECLARE_ALIGNED(256, static const InterpKernel,
                 bilinear_filters[SUBPEL_SHIFTS]) = {
diff --git a/vp10/common/vp9_filter.h b/vp10/common/filter.h
index 983f81788..983f81788 100644
--- a/vp10/common/vp9_filter.h
+++ b/vp10/common/filter.h
diff --git a/vp10/common/vp9_frame_buffers.c b/vp10/common/frame_buffers.c
index d200577f9..794c80fde 100644
--- a/vp10/common/vp9_frame_buffers.c
+++ b/vp10/common/frame_buffers.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_frame_buffers.h"
+#include "vp10/common/frame_buffers.h"
 #include "vpx_mem/vpx_mem.h"
 
 int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) {
diff --git a/vp10/common/vp9_frame_buffers.h b/vp10/common/frame_buffers.h
index 35d975b89..35d975b89 100644
--- a/vp10/common/vp9_frame_buffers.h
+++ b/vp10/common/frame_buffers.h
diff --git a/vp10/common/vp9_idct.c b/vp10/common/idct.c
index 09537eead..4eff7d108 100644
--- a/vp10/common/vp9_idct.c
+++ b/vp10/common/idct.c
@@ -12,9 +12,9 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/systemdependent.h"
 #include "vpx_dsp/inv_txfm.h"
 #include "vpx_ports/mem.h"
 
diff --git a/vp10/common/vp9_idct.h b/vp10/common/idct.h
index ea2b09fc7..496917ebb 100644
--- a/vp10/common/vp9_idct.h
+++ b/vp10/common/idct.h
@@ -14,8 +14,8 @@
 #include <assert.h>
 
 #include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/common.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/inv_txfm.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"
diff --git a/vp10/common/vp9_loopfilter.c b/vp10/common/loopfilter.c
index 0233ae086..40b6d760f 100644
--- a/vp10/common/vp9_loopfilter.c
+++ b/vp10/common/loopfilter.c
@@ -10,13 +10,13 @@
 
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_reconinter.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/reconinter.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
 // 64 bit masks for left transform size. Each 1 represents a position where
 // we should apply a loop filter across the left border of an 8x8 block
diff --git a/vp10/common/vp9_loopfilter.h b/vp10/common/loopfilter.h
index 97abdfb13..a26fe6b65 100644
--- a/vp10/common/vp9_loopfilter.h
+++ b/vp10/common/loopfilter.h
@@ -14,8 +14,8 @@
 #include "vpx_ports/mem.h"
 #include "./vpx_config.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_mfqe.c b/vp10/common/mfqe.c
index 5a65d44c4..49a3c7643 100644
--- a/vp10/common/vp9_mfqe.c
+++ b/vp10/common/mfqe.c
@@ -13,8 +13,8 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/postproc.h"
 
 // TODO(jackychen): Replace this function with SSE2 code. There is
 // one SSE2 implementation in vp8, so will consider how to share it
diff --git a/vp10/common/vp9_mfqe.h b/vp10/common/mfqe.h
index 163c1f161..163c1f161 100644
--- a/vp10/common/vp9_mfqe.h
+++ b/vp10/common/mfqe.h
diff --git a/vp10/common/mips/dspr2/vp9_itrans16_dspr2.c b/vp10/common/mips/dspr2/itrans16_dspr2.c
index 58a95f7c9..3d1bd3d90 100644
--- a/vp10/common/mips/dspr2/vp9_itrans16_dspr2.c
+++ b/vp10/common/mips/dspr2/itrans16_dspr2.c
@@ -13,9 +13,9 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
 #include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"
diff --git a/vp10/common/mips/dspr2/vp9_itrans4_dspr2.c b/vp10/common/mips/dspr2/itrans4_dspr2.c
index 626f7ff66..5249287b8 100644
--- a/vp10/common/mips/dspr2/vp9_itrans4_dspr2.c
+++ b/vp10/common/mips/dspr2/itrans4_dspr2.c
@@ -13,9 +13,9 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
 #include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"
diff --git a/vp10/common/mips/dspr2/vp9_itrans8_dspr2.c b/vp10/common/mips/dspr2/itrans8_dspr2.c
index a5ff2fe1f..b25b93aee 100644
--- a/vp10/common/mips/dspr2/vp9_itrans8_dspr2.c
+++ b/vp10/common/mips/dspr2/itrans8_dspr2.c
@@ -13,8 +13,8 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/blockd.h"
 #include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"
diff --git a/vp10/common/mips/msa/vp9_idct16x16_msa.c b/vp10/common/mips/msa/idct16x16_msa.c
index 1778991bd..a89e41b3d 100644
--- a/vp10/common/mips/msa/vp9_idct16x16_msa.c
+++ b/vp10/common/mips/msa/idct16x16_msa.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst,
diff --git a/vp10/common/mips/msa/vp9_idct4x4_msa.c b/vp10/common/mips/msa/idct4x4_msa.c
index 16566fedf..866f321ab 100644
--- a/vp10/common/mips/msa/vp9_idct4x4_msa.c
+++ b/vp10/common/mips/msa/idct4x4_msa.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst,
diff --git a/vp10/common/mips/msa/vp9_idct8x8_msa.c b/vp10/common/mips/msa/idct8x8_msa.c
index 77c9e805a..726af4e9e 100644
--- a/vp10/common/mips/msa/vp9_idct8x8_msa.c
+++ b/vp10/common/mips/msa/idct8x8_msa.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst,
diff --git a/vp10/common/mips/msa/vp9_mfqe_msa.c b/vp10/common/mips/msa/mfqe_msa.c
index c446cda7c..3a593a1a1 100644
--- a/vp10/common/mips/msa/vp9_mfqe_msa.c
+++ b/vp10/common/mips/msa/mfqe_msa.c
@@ -9,7 +9,7 @@
  */
 
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/onyxc_int.h"
 #include "vpx_dsp/mips/macros_msa.h"
 
 static void filter_by_weight8x8_msa(const uint8_t *src_ptr, int32_t src_stride,
diff --git a/vp10/common/vp9_mv.h b/vp10/common/mv.h
index 5b3f804fd..62b77b838 100644
--- a/vp10/common/vp9_mv.h
+++ b/vp10/common/mv.h
@@ -13,7 +13,7 @@
 
 #include "vpx/vpx_integer.h"
 
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_mvref_common.c b/vp10/common/mvref_common.c
index ea47f8c1c..d8c150742 100644
--- a/vp10/common/vp9_mvref_common.c
+++ b/vp10/common/mvref_common.c
@@ -9,7 +9,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_mvref_common.h"
+#include "vp10/common/mvref_common.h"
 
 // This function searches the neighbourhood of a given MB/SB
 // to try and find candidate reference vectors.
diff --git a/vp10/common/vp9_mvref_common.h b/vp10/common/mvref_common.h
index e5125498e..cdd0f3c67 100644
--- a/vp10/common/vp9_mvref_common.h
+++ b/vp10/common/mvref_common.h
@@ -10,8 +10,8 @@
 #ifndef VP9_COMMON_VP9_MVREF_COMMON_H_
 #define VP9_COMMON_VP9_MVREF_COMMON_H_
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_onyxc_int.h b/vp10/common/onyxc_int.h
index 58dcea9d1..8d3074c6a 100644
--- a/vp10/common/vp9_onyxc_int.h
+++ b/vp10/common/onyxc_int.h
@@ -15,17 +15,17 @@
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vpx_util/vpx_thread.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_frame_buffers.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/frame_buffers.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/tile_common.h"
 
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/vp10/common/vp9_postproc.c b/vp10/common/postproc.c
index 97b597d0c..25e1da88c 100644
--- a/vp10/common/vp9_postproc.c
+++ b/vp10/common/postproc.c
@@ -20,10 +20,10 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_postproc.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_textblit.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/postproc.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/textblit.h"
 
 #if CONFIG_VP9_POSTPROC
 static const short kernel5[] = {
diff --git a/vp10/common/vp9_postproc.h b/vp10/common/postproc.h
index 212d37b00..14ef876ad 100644
--- a/vp10/common/vp9_postproc.h
+++ b/vp10/common/postproc.h
@@ -14,9 +14,9 @@
 
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_mfqe.h"
-#include "vp10/common/vp9_ppflags.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/mfqe.h"
+#include "vp10/common/ppflags.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_ppflags.h b/vp10/common/ppflags.h
index 4a3ef4125..4a3ef4125 100644
--- a/vp10/common/vp9_ppflags.h
+++ b/vp10/common/ppflags.h
diff --git a/vp10/common/vp9_pred_common.c b/vp10/common/pred_common.c
index 022035099..1b60a094e 100644
--- a/vp10/common/vp9_pred_common.c
+++ b/vp10/common/pred_common.c
@@ -9,9 +9,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/seg_common.h"
 
 // Returns a context number for the given MB prediction signal
 int vp10_get_pred_context_switchable_interp(const MACROBLOCKD *xd) {
diff --git a/vp10/common/vp9_pred_common.h b/vp10/common/pred_common.h
index fbd597af0..69b42e335 100644
--- a/vp10/common/vp9_pred_common.h
+++ b/vp10/common/pred_common.h
@@ -11,8 +11,8 @@
 #ifndef VP9_COMMON_VP9_PRED_COMMON_H_
 #define VP9_COMMON_VP9_PRED_COMMON_H_
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/onyxc_int.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_quant_common.c b/vp10/common/quant_common.c
index bb30836d7..edf739401 100644
--- a/vp10/common/vp9_quant_common.c
+++ b/vp10/common/quant_common.c
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
 
 static const int16_t dc_qlookup[QINDEX_RANGE] = {
   4,       8,    8,    9,   10,   11,   12,   12,
diff --git a/vp10/common/vp9_quant_common.h b/vp10/common/quant_common.h
index 9e53dda8f..d44b132d0 100644
--- a/vp10/common/vp9_quant_common.h
+++ b/vp10/common/quant_common.h
@@ -12,7 +12,7 @@
 #define VP9_COMMON_VP9_QUANT_COMMON_H_
 
 #include "vpx/vpx_codec.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_reconinter.c b/vp10/common/reconinter.c
index 9562ccf64..c9e46e076 100644
--- a/vp10/common/vp9_reconinter.c
+++ b/vp10/common/reconinter.c
@@ -15,9 +15,9 @@
 
 #include "vpx/vpx_integer.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
 
 #if CONFIG_VP9_HIGHBITDEPTH
 void vp10_highbd_build_inter_predictor(const uint8_t *src, int src_stride,
diff --git a/vp10/common/vp9_reconinter.h b/vp10/common/reconinter.h
index 671dc6394..d9f3ab5a8 100644
--- a/vp10/common/vp9_reconinter.h
+++ b/vp10/common/reconinter.h
@@ -11,8 +11,8 @@
 #ifndef VP9_COMMON_VP9_RECONINTER_H_
 #define VP9_COMMON_VP9_RECONINTER_H_
 
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/onyxc_int.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/vpx_filter.h"
 
diff --git a/vp10/common/vp9_reconintra.c b/vp10/common/reconintra.c
index 309b1b9e3..c58da59ae 100644
--- a/vp10/common/vp9_reconintra.c
+++ b/vp10/common/reconintra.c
@@ -18,8 +18,8 @@
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_once.h"
 
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/onyxc_int.h"
 
 enum {
   NEED_LEFT = 1 << 1,
diff --git a/vp10/common/vp9_reconintra.h b/vp10/common/reconintra.h
index eb305e242..0b3891a3c 100644
--- a/vp10/common/vp9_reconintra.h
+++ b/vp10/common/reconintra.h
@@ -12,7 +12,7 @@
 #define VP9_COMMON_VP9_RECONINTRA_H_
 
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_scale.c b/vp10/common/scale.c
index 078302801..ce6062c19 100644
--- a/vp10/common/vp9_scale.c
+++ b/vp10/common/scale.c
@@ -9,8 +9,8 @@
  */
 
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_scale.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/scale.h"
 #include "vpx_dsp/vpx_filter.h"
 
 static INLINE int scaled_x(int val, const struct scale_factors *sf) {
diff --git a/vp10/common/vp9_scale.h b/vp10/common/scale.h
index 6bbd1eb53..5e5e7d09e 100644
--- a/vp10/common/vp9_scale.h
+++ b/vp10/common/scale.h
@@ -11,7 +11,7 @@
 #ifndef VP9_COMMON_VP9_SCALE_H_
 #define VP9_COMMON_VP9_SCALE_H_
 
-#include "vp10/common/vp9_mv.h"
+#include "vp10/common/mv.h"
 #include "vpx_dsp/vpx_convolve.h"
 
 #ifdef __cplusplus
diff --git a/vp10/common/vp9_scan.c b/vp10/common/scan.c
index cdea0a5cc..7217f6d04 100644
--- a/vp10/common/vp9_scan.c
+++ b/vp10/common/scan.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_scan.h"
+#include "vp10/common/scan.h"
 
 DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
   0,  4,  1,  5,
diff --git a/vp10/common/vp9_scan.h b/vp10/common/scan.h
index 89d0ed78d..cf93c09ec 100644
--- a/vp10/common/vp9_scan.h
+++ b/vp10/common/scan.h
@@ -14,8 +14,8 @@
 #include "vpx/vpx_integer.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/enums.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/common/vp9_seg_common.c b/vp10/common/seg_common.c
index 8a6ab1c3f..1bf09b9a0 100644
--- a/vp10/common/vp9_seg_common.c
+++ b/vp10/common/seg_common.c
@@ -10,10 +10,10 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_quant_common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/quant_common.h"
 
 static const int seg_feature_data_signed[SEG_LVL_MAX] = { 1, 1, 0, 0 };
 
diff --git a/vp10/common/vp9_seg_common.h b/vp10/common/seg_common.h
index 4c6d3eac8..4c6d3eac8 100644
--- a/vp10/common/vp9_seg_common.h
+++ b/vp10/common/seg_common.h
diff --git a/vp10/common/vp9_systemdependent.h b/vp10/common/systemdependent.h
index 5940d7336..5940d7336 100644
--- a/vp10/common/vp9_systemdependent.h
+++ b/vp10/common/systemdependent.h
diff --git a/vp10/common/vp9_textblit.c b/vp10/common/textblit.c
index 42f47a6d6..2e8811ea5 100644
--- a/vp10/common/vp9_textblit.c
+++ b/vp10/common/textblit.c
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "vp10/common/vp9_textblit.h"
+#include "vp10/common/textblit.h"
 
 static const int font[] = {
   0x0, 0x5C00, 0x8020, 0xAFABEA, 0xD7EC0, 0x1111111, 0x1855740, 0x18000,
diff --git a/vp10/common/vp9_textblit.h b/vp10/common/textblit.h
index 179acc12f..179acc12f 100644
--- a/vp10/common/vp9_textblit.h
+++ b/vp10/common/textblit.h
diff --git a/vp10/common/vp9_thread_common.c b/vp10/common/thread_common.c
index e936453d8..088589e4d 100644
--- a/vp10/common/vp9_thread_common.c
+++ b/vp10/common/thread_common.c
@@ -10,10 +10,10 @@
 
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_loopfilter.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/loopfilter.h"
 
 #if CONFIG_MULTITHREAD
 static INLINE void mutex_lock(pthread_mutex_t *const mutex) {
diff --git a/vp10/common/vp9_thread_common.h b/vp10/common/thread_common.h
index a48450d42..09f100b10 100644
--- a/vp10/common/vp9_thread_common.h
+++ b/vp10/common/thread_common.h
@@ -11,7 +11,7 @@
 #ifndef VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
 #define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
 #include "./vpx_config.h"
-#include "vp10/common/vp9_loopfilter.h"
+#include "vp10/common/loopfilter.h"
 #include "vpx_util/vpx_thread.h"
 
 struct VP9Common;
diff --git a/vp10/common/vp9_tile_common.c b/vp10/common/tile_common.c
index 56840d1f2..fb7fac663 100644
--- a/vp10/common/vp9_tile_common.c
+++ b/vp10/common/tile_common.c
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/tile_common.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/onyxc_int.h"
 
 #define MIN_TILE_WIDTH_B64 4
 #define MAX_TILE_WIDTH_B64 64
diff --git a/vp10/common/vp9_tile_common.h b/vp10/common/tile_common.h
index cd7b84d65..cd7b84d65 100644
--- a/vp10/common/vp9_tile_common.h
+++ b/vp10/common/tile_common.h
diff --git a/vp10/common/vp10_rtcd_defs.pl b/vp10/common/vp10_rtcd_defs.pl
index 78cc2d042..6de3bb06b 100644
--- a/vp10/common/vp10_rtcd_defs.pl
+++ b/vp10/common/vp10_rtcd_defs.pl
@@ -1,12 +1,12 @@
 sub vp10_common_forward_decls() {
 print <<EOF
 /*
- * VP9
+ * VP10
  */
 
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/common.h"
+#include "vp10/common/enums.h"
 
 struct macroblockd;
 
diff --git a/vp10/common/x86/vp9_idct_intrin_sse2.c b/vp10/common/x86/idct_intrin_sse2.c
index d58e26358..d58e26358 100644
--- a/vp10/common/x86/vp9_idct_intrin_sse2.c
+++ b/vp10/common/x86/idct_intrin_sse2.c
diff --git a/vp10/common/x86/vp9_mfqe_sse2.asm b/vp10/common/x86/mfqe_sse2.asm
index e714d06db..e714d06db 100644
--- a/vp10/common/x86/vp9_mfqe_sse2.asm
+++ b/vp10/common/x86/mfqe_sse2.asm
diff --git a/vp10/common/x86/vp9_postproc_sse2.asm b/vp10/common/x86/postproc_sse2.asm
index d5f8e927b..d5f8e927b 100644
--- a/vp10/common/x86/vp9_postproc_sse2.asm
+++ b/vp10/common/x86/postproc_sse2.asm
diff --git a/vp10/decoder/vp9_decodeframe.c b/vp10/decoder/decodeframe.c
index f079e28ea..8814f9691 100644
--- a/vp10/decoder/vp9_decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -23,24 +23,24 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_detokenize.h"
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/detokenize.h"
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/dsubexp.h"
 
 #define MAX_VP9_HEADER_SIZE 80
 
diff --git a/vp10/decoder/vp9_decodeframe.h b/vp10/decoder/decodeframe.h
index 39a59460e..39a59460e 100644
--- a/vp10/decoder/vp9_decodeframe.h
+++ b/vp10/decoder/decodeframe.h
diff --git a/vp10/decoder/vp9_decodemv.c b/vp10/decoder/decodemv.c
index 0f8c76b54..439b82937 100644
--- a/vp10/decoder/vp9_decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -10,17 +10,17 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decodeframe.h"
 
 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
   return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p);
diff --git a/vp10/decoder/vp9_decodemv.h b/vp10/decoder/decodemv.h
index bdca0db50..8734ccc4b 100644
--- a/vp10/decoder/vp9_decodemv.h
+++ b/vp10/decoder/decodemv.h
@@ -13,7 +13,7 @@
 
 #include "vpx_dsp/bitreader.h"
 
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/decoder/decoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/decoder/vp9_decoder.c b/vp10/decoder/decoder.c
index 5dd364c27..dda5d6cd3 100644
--- a/vp10/decoder/vp9_decoder.c
+++ b/vp10/decoder/decoder.c
@@ -22,19 +22,19 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
 
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/detokenize.h"
 
 static void initialize_dec(void) {
   static volatile int init_done = 0;
diff --git a/vp10/decoder/vp9_decoder.h b/vp10/decoder/decoder.h
index db26f4dd4..462a64ebd 100644
--- a/vp10/decoder/vp9_decoder.h
+++ b/vp10/decoder/decoder.h
@@ -18,10 +18,10 @@
 #include "vpx_scale/yv12config.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/decoder/vp9_dthread.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/decoder/dthread.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/decoder/vp9_detokenize.c b/vp10/decoder/detokenize.c
index 5cea0f7d7..2902ece7c 100644
--- a/vp10/decoder/vp9_detokenize.c
+++ b/vp10/decoder/detokenize.c
@@ -11,14 +11,14 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
 #if CONFIG_COEFFICIENT_RANGE_CHECKING
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/idct.h"
 #endif
 
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/detokenize.h"
 
 #define EOB_CONTEXT_NODE            0
 #define ZERO_CONTEXT_NODE           1
diff --git a/vp10/decoder/vp9_detokenize.h b/vp10/decoder/detokenize.h
index 17aaffea2..cf752d1d4 100644
--- a/vp10/decoder/vp9_detokenize.h
+++ b/vp10/decoder/detokenize.h
@@ -13,8 +13,8 @@
 #define VP9_DECODER_VP9_DETOKENIZE_H_
 
 #include "vpx_dsp/bitreader.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/common/vp9_scan.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/common/scan.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/decoder/vp9_dsubexp.c b/vp10/decoder/dsubexp.c
index 5c82b3144..dbcdb4964 100644
--- a/vp10/decoder/vp9_dsubexp.c
+++ b/vp10/decoder/dsubexp.c
@@ -10,9 +10,9 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
 
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/decoder/dsubexp.h"
 
 static int inv_recenter_nonneg(int v, int m) {
   if (v > 2 * m)
diff --git a/vp10/decoder/vp9_dsubexp.h b/vp10/decoder/dsubexp.h
index a422f555a..a422f555a 100644
--- a/vp10/decoder/vp9_dsubexp.h
+++ b/vp10/decoder/dsubexp.h
diff --git a/vp10/decoder/vp9_dthread.c b/vp10/decoder/dthread.c
index 3436dd2f4..391613a3d 100644
--- a/vp10/decoder/vp9_dthread.c
+++ b/vp10/decoder/dthread.c
@@ -10,9 +10,9 @@
 
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/decoder/vp9_dthread.h"
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/decoder/dthread.h"
+#include "vp10/decoder/decoder.h"
 
 // #define DEBUG_THREAD
 
diff --git a/vp10/decoder/vp9_dthread.h b/vp10/decoder/dthread.h
index 008103507..008103507 100644
--- a/vp10/decoder/vp9_dthread.h
+++ b/vp10/decoder/dthread.h
diff --git a/vp10/encoder/vp9_aq_complexity.c b/vp10/encoder/aq_complexity.c
index ae9dd8659..35ead9577 100644
--- a/vp10/encoder/vp9_aq_complexity.c
+++ b/vp10/encoder/aq_complexity.c
@@ -11,11 +11,11 @@
 #include <limits.h>
 #include <math.h>
 
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/encoder/segmentation.h"
 
 #define AQ_C_SEGMENTS  5
 #define DEFAULT_AQ2_SEG 3   // Neutral Q segment
diff --git a/vp10/encoder/vp9_aq_complexity.h b/vp10/encoder/aq_complexity.h
index 43a0fbf18..9048da629 100644
--- a/vp10/encoder/vp9_aq_complexity.h
+++ b/vp10/encoder/aq_complexity.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 
 struct VP9_COMP;
 struct macroblock;
diff --git a/vp10/encoder/vp9_aq_cyclicrefresh.c b/vp10/encoder/aq_cyclicrefresh.c
index 93ca00bc3..dcf2ca33c 100644
--- a/vp10/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp10/encoder/aq_cyclicrefresh.c
@@ -11,12 +11,12 @@
 #include <limits.h>
 #include <math.h>
 
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
 
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/segmentation.h"
 
 struct CYCLIC_REFRESH {
   // Percentage of blocks per frame that are targeted as candidates
diff --git a/vp10/encoder/vp9_aq_cyclicrefresh.h b/vp10/encoder/aq_cyclicrefresh.h
index a020f05d3..3eb6462f9 100644
--- a/vp10/encoder/vp9_aq_cyclicrefresh.h
+++ b/vp10/encoder/aq_cyclicrefresh.h
@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
 #define VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_aq_variance.c b/vp10/encoder/aq_variance.c
index f8e18ce02..b88a3fb5f 100644
--- a/vp10/encoder/vp9_aq_variance.c
+++ b/vp10/encoder/aq_variance.c
@@ -12,14 +12,14 @@
 
 #include "vpx_ports/mem.h"
 
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/encoder/aq_variance.h"
 
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/common/systemdependent.h"
 
 #define ENERGY_MIN (-4)
 #define ENERGY_MAX (1)
diff --git a/vp10/encoder/vp9_aq_variance.h b/vp10/encoder/aq_variance.h
index 001e7b4ef..199493e11 100644
--- a/vp10/encoder/vp9_aq_variance.h
+++ b/vp10/encoder/aq_variance.h
@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_
 #define VP9_ENCODER_VP9_AQ_VARIANCE_H_
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/arm/neon/vp9_avg_neon.c b/vp10/encoder/arm/neon/avg_neon.c
index c4ec5c4a7..c4ec5c4a7 100644
--- a/vp10/encoder/arm/neon/vp9_avg_neon.c
+++ b/vp10/encoder/arm/neon/avg_neon.c
diff --git a/vp10/encoder/arm/neon/vp9_dct_neon.c b/vp10/encoder/arm/neon/dct_neon.c
index c91178250..b37a2ff3a 100644
--- a/vp10/encoder/arm/neon/vp9_dct_neon.c
+++ b/vp10/encoder/arm/neon/dct_neon.c
@@ -14,7 +14,7 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 #include "vpx_dsp/txfm_common.h"
 
 void vp10_fdct8x8_quant_neon(const int16_t *input, int stride,
diff --git a/vp10/encoder/arm/neon/vp9_error_neon.c b/vp10/encoder/arm/neon/error_neon.c
index 009520aee..009520aee 100644
--- a/vp10/encoder/arm/neon/vp9_error_neon.c
+++ b/vp10/encoder/arm/neon/error_neon.c
diff --git a/vp10/encoder/arm/neon/vp9_quantize_neon.c b/vp10/encoder/arm/neon/quantize_neon.c
index a7dce3742..9354ced69 100644
--- a/vp10/encoder/arm/neon/vp9_quantize_neon.c
+++ b/vp10/encoder/arm/neon/quantize_neon.c
@@ -14,12 +14,12 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
 
 void vp10_quantize_fp_neon(const int16_t *coeff_ptr, intptr_t count,
                           int skip_block, const int16_t *zbin_ptr,
diff --git a/vp10/encoder/vp9_avg.c b/vp10/encoder/avg.c
index 39e9762b1..738c4273d 100644
--- a/vp10/encoder/vp9_avg.c
+++ b/vp10/encoder/avg.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 #include "vpx_ports/mem.h"
 
 unsigned int vp10_avg_8x8_c(const uint8_t *s, int p) {
diff --git a/vp10/encoder/vp9_bitstream.c b/vp10/encoder/bitstream.c
index fb2201c7b..43fa23513 100644
--- a/vp10/encoder/vp9_bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -17,22 +17,22 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem_ops.h"
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_bitstream.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_subexp.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/bitstream.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/subexp.h"
+#include "vp10/encoder/tokenize.h"
 
 static const struct vp10_token intra_mode_encodings[INTRA_MODES] = {
   {0, 1}, {6, 3}, {28, 5}, {30, 5}, {58, 6}, {59, 6}, {126, 7}, {127, 7},
diff --git a/vp10/encoder/vp9_bitstream.h b/vp10/encoder/bitstream.h
index 3d73a6e92..d235c3217 100644
--- a/vp10/encoder/vp9_bitstream.h
+++ b/vp10/encoder/bitstream.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 void vp10_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size);
 
diff --git a/vp10/encoder/vp9_block.h b/vp10/encoder/block.h
index 869416dc3..423c4d7bd 100644
--- a/vp10/encoder/vp9_block.h
+++ b/vp10/encoder/block.h
@@ -11,8 +11,8 @@
 #ifndef VP9_ENCODER_VP9_BLOCK_H_
 #define VP9_ENCODER_VP9_BLOCK_H_
 
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/entropy.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_blockiness.c b/vp10/encoder/blockiness.c
index 8312abfc9..da443486e 100644
--- a/vp10/encoder/vp9_blockiness.c
+++ b/vp10/encoder/blockiness.c
@@ -11,8 +11,8 @@
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/common.h"
+#include "vp10/common/filter.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_filter.h"
diff --git a/vp10/encoder/vp9_context_tree.c b/vp10/encoder/context_tree.c
index 7d623eebd..11a7bb3ac 100644
--- a/vp10/encoder/vp9_context_tree.c
+++ b/vp10/encoder/context_tree.c
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encoder.h"
 
 static const BLOCK_SIZE square[] = {
   BLOCK_8X8,
diff --git a/vp10/encoder/vp9_context_tree.h b/vp10/encoder/context_tree.h
index 9963ed2e7..fd6587000 100644
--- a/vp10/encoder/vp9_context_tree.h
+++ b/vp10/encoder/context_tree.h
@@ -11,8 +11,8 @@
 #ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_
 #define VP9_ENCODER_VP9_CONTEXT_TREE_H_
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/block.h"
 
 struct VP9_COMP;
 struct VP9Common;
diff --git a/vp10/encoder/vp9_cost.c b/vp10/encoder/cost.c
index 8af22e591..aab826322 100644
--- a/vp10/encoder/vp9_cost.c
+++ b/vp10/encoder/cost.c
@@ -9,7 +9,7 @@
  */
 #include <assert.h>
 
-#include "vp10/encoder/vp9_cost.h"
+#include "vp10/encoder/cost.h"
 
 const unsigned int vp10_prob_cost[256] = {
   2047, 2047, 1791, 1641, 1535, 1452, 1385, 1328, 1279, 1235, 1196, 1161,
diff --git a/vp10/encoder/vp9_cost.h b/vp10/encoder/cost.h
index 3086f7901..3086f7901 100644
--- a/vp10/encoder/vp9_cost.h
+++ b/vp10/encoder/cost.h
diff --git a/vp10/encoder/vp9_dct.c b/vp10/encoder/dct.c
index 810e422a8..0581b1455 100644
--- a/vp10/encoder/vp9_dct.c
+++ b/vp10/encoder/dct.c
@@ -15,9 +15,9 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/systemdependent.h"
 #include "vpx_dsp/fwd_txfm.h"
 #include "vpx_ports/mem.h"
 
diff --git a/vp10/encoder/vp9_denoiser.c b/vp10/encoder/denoiser.c
index dfc0e47db..4a79b1131 100644
--- a/vp10/encoder/vp9_denoiser.c
+++ b/vp10/encoder/denoiser.c
@@ -13,9 +13,9 @@
 #include "./vpx_dsp_rtcd.h"
 #include "vpx_scale/yv12config.h"
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/denoiser.h"
 
 /* The VP9 denoiser is a work-in-progress. It currently is only designed to work
  * with speed 6, though it (inexplicably) seems to also work with speed 5 (one
diff --git a/vp10/encoder/vp9_denoiser.h b/vp10/encoder/denoiser.h
index 0016ead10..e543fb05f 100644
--- a/vp10/encoder/vp9_denoiser.h
+++ b/vp10/encoder/denoiser.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_DENOISER_H_
 #define VP9_ENCODER_DENOISER_H_
 
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 #include "vpx_scale/yv12config.h"
 
 #ifdef __cplusplus
diff --git a/vp10/encoder/vp9_encodeframe.c b/vp10/encoder/encodeframe.c
index dd16d34ec..bf496ff2f 100644
--- a/vp10/encoder/vp9_encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -19,32 +19,32 @@
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_ethread.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_pickmode.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_rdopt.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/ethread.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/pickmode.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/rdopt.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/tokenize.h"
 
 static void encode_superblock(VP9_COMP *cpi, ThreadData * td,
                               TOKENEXTRA **t, int output_enabled,
diff --git a/vp10/encoder/vp9_encodeframe.h b/vp10/encoder/encodeframe.h
index 5d0ea7cc5..5d0ea7cc5 100644
--- a/vp10/encoder/vp9_encodeframe.h
+++ b/vp10/encoder/encodeframe.h
diff --git a/vp10/encoder/vp9_encodemb.c b/vp10/encoder/encodemb.c
index be4ed6cfe..105fac1a8 100644
--- a/vp10/encoder/vp9_encodemb.c
+++ b/vp10/encoder/encodemb.c
@@ -17,15 +17,15 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/tokenize.h"
 
 struct optimize_ctx {
   ENTROPY_CONTEXT ta[MAX_MB_PLANE][16];
diff --git a/vp10/encoder/vp9_encodemb.h b/vp10/encoder/encodemb.h
index 776b5f4dc..7914d6fda 100644
--- a/vp10/encoder/vp9_encodemb.h
+++ b/vp10/encoder/encodemb.h
@@ -12,7 +12,7 @@
 #define VP9_ENCODER_VP9_ENCODEMB_H_
 
 #include "./vpx_config.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_encodemv.c b/vp10/encoder/encodemv.c
index 4a1e990a7..90a9857bc 100644
--- a/vp10/encoder/vp9_encodemv.c
+++ b/vp10/encoder/encodemv.c
@@ -10,12 +10,12 @@
 
 #include <math.h>
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/systemdependent.h"
 
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemv.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemv.h"
 
 static struct vp10_token mv_joint_encodings[MV_JOINTS];
 static struct vp10_token mv_class_encodings[MV_CLASSES];
diff --git a/vp10/encoder/vp9_encodemv.h b/vp10/encoder/encodemv.h
index 052f4a738..3ac457281 100644
--- a/vp10/encoder/vp9_encodemv.h
+++ b/vp10/encoder/encodemv.h
@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_ENCODEMV_H_
 #define VP9_ENCODER_VP9_ENCODEMV_H_
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_encoder.c b/vp10/encoder/encoder.c
index a4afca149..358cd5a9d 100644
--- a/vp10/encoder/vp9_encoder.c
+++ b/vp10/encoder/encoder.c
@@ -22,40 +22,40 @@
 #include "vpx_ports/vpx_timer.h"
 #include "vpx_scale/vpx_scale.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/idct.h"
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_bitstream.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_ethread.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mbgraph.h"
-#include "vp10/encoder/vp9_picklpf.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_resize.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_skin_detection.h"
-#include "vp10/encoder/vp9_speed_features.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/bitstream.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/ethread.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mbgraph.h"
+#include "vp10/encoder/picklpf.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/resize.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/skin_detection.h"
+#include "vp10/encoder/speed_features.h"
 #if CONFIG_INTERNAL_STATS
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 #endif
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_temporal_filter.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/temporal_filter.h"
 
 #define AM_SEGMENT_ID_INACTIVE 7
 #define AM_SEGMENT_ID_ACTIVE 0
diff --git a/vp10/encoder/vp9_encoder.h b/vp10/encoder/encoder.h
index 3e62aa087..53d930303 100644
--- a/vp10/encoder/vp9_encoder.h
+++ b/vp10/encoder/encoder.h
@@ -18,32 +18,32 @@
 #include "vpx/vp8cx.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_lookahead.h"
-#include "vp10/encoder/vp9_mbgraph.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/lookahead.h"
+#include "vp10/encoder/mbgraph.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
 #if CONFIG_INTERNAL_STATS
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 #endif
-#include "vp10/encoder/vp9_speed_features.h"
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/encoder/speed_features.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/tokenize.h"
 #include "vpx_dsp/variance.h"
 
 #if CONFIG_VP9_TEMPORAL_DENOISING
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/encoder/denoiser.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/vp10/encoder/vp9_ethread.c b/vp10/encoder/ethread.c
index 6a752be7d..322bd5ac1 100644
--- a/vp10/encoder/vp9_ethread.c
+++ b/vp10/encoder/ethread.c
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_ethread.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/ethread.h"
 
 static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
   int i, j, k, l, m, n;
diff --git a/vp10/encoder/vp9_ethread.h b/vp10/encoder/ethread.h
index 74db03747..74db03747 100644
--- a/vp10/encoder/vp9_ethread.h
+++ b/vp10/encoder/ethread.h
diff --git a/vp10/encoder/vp9_extend.c b/vp10/encoder/extend.c
index d42998d68..2ffbac0f9 100644
--- a/vp10/encoder/vp9_extend.c
+++ b/vp10/encoder/extend.c
@@ -11,8 +11,8 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/encoder/vp9_extend.h"
+#include "vp10/common/common.h"
+#include "vp10/encoder/extend.h"
 
 static void copy_and_extend_plane(const uint8_t *src, int src_pitch,
                                   uint8_t *dst, int dst_pitch,
diff --git a/vp10/encoder/vp9_extend.h b/vp10/encoder/extend.h
index 97f423ef4..97f423ef4 100644
--- a/vp10/encoder/vp9_extend.h
+++ b/vp10/encoder/extend.h
diff --git a/vp10/encoder/vp9_fastssim.c b/vp10/encoder/fastssim.c
index d5a1e59c8..126250247 100644
--- a/vp10/encoder/vp9_fastssim.c
+++ b/vp10/encoder/fastssim.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 /* TODO(jbb): High bit depth version of this code needed */
 typedef struct fs_level fs_level;
 typedef struct fs_ctx fs_ctx;
diff --git a/vp10/encoder/vp9_firstpass.c b/vp10/encoder/firstpass.c
index e3caa5af7..6f95eea04 100644
--- a/vp10/encoder/vp9_firstpass.c
+++ b/vp10/encoder/firstpass.c
@@ -20,21 +20,21 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"  // vp10_setup_dst_planes()
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"  // vp10_setup_dst_planes()
+#include "vp10/common/systemdependent.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
 #include "vpx_dsp/variance.h"
 
 #define OUTPUT_FPF          0
diff --git a/vp10/encoder/vp9_firstpass.h b/vp10/encoder/firstpass.h
index e50a35246..17b930a42 100644
--- a/vp10/encoder/vp9_firstpass.h
+++ b/vp10/encoder/firstpass.h
@@ -11,8 +11,8 @@
 #ifndef VP9_ENCODER_VP9_FIRSTPASS_H_
 #define VP9_ENCODER_VP9_FIRSTPASS_H_
 
-#include "vp10/encoder/vp9_lookahead.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/encoder/lookahead.h"
+#include "vp10/encoder/ratectrl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_lookahead.c b/vp10/encoder/lookahead.c
index 1922a35b1..5a7633657 100644
--- a/vp10/encoder/vp9_lookahead.c
+++ b/vp10/encoder/lookahead.c
@@ -12,11 +12,11 @@
 
 #include "./vpx_config.h"
 
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_lookahead.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/lookahead.h"
 
 /* Return the buffer at the given absolute index and increment the index */
 static struct lookahead_entry *pop(struct lookahead_ctx *ctx,
diff --git a/vp10/encoder/vp9_lookahead.h b/vp10/encoder/lookahead.h
index e7aeb5f90..e7aeb5f90 100644
--- a/vp10/encoder/vp9_lookahead.h
+++ b/vp10/encoder/lookahead.h
diff --git a/vp10/encoder/vp9_mbgraph.c b/vp10/encoder/mbgraph.c
index f7f1f0113..f676dd7da 100644
--- a/vp10/encoder/vp9_mbgraph.c
+++ b/vp10/encoder/mbgraph.c
@@ -14,12 +14,12 @@
 #include "./vpx_dsp_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
 
 
 static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,
diff --git a/vp10/encoder/vp9_mbgraph.h b/vp10/encoder/mbgraph.h
index dda820bd3..dda820bd3 100644
--- a/vp10/encoder/vp9_mbgraph.h
+++ b/vp10/encoder/mbgraph.h
diff --git a/vp10/encoder/vp9_mcomp.c b/vp10/encoder/mcomp.c
index 6e22d8fe0..0daa0ee0e 100644
--- a/vp10/encoder/vp9_mcomp.c
+++ b/vp10/encoder/mcomp.c
@@ -18,11 +18,11 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_reconinter.h"
+#include "vp10/common/common.h"
+#include "vp10/common/reconinter.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
 
 // #define NEW_DIAMOND_SEARCH
 
diff --git a/vp10/encoder/vp9_mcomp.h b/vp10/encoder/mcomp.h
index 5af4ab071..3fe9f6c95 100644
--- a/vp10/encoder/vp9_mcomp.h
+++ b/vp10/encoder/mcomp.h
@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_MCOMP_H_
 #define VP9_ENCODER_VP9_MCOMP_H_
 
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 #include "vpx_dsp/variance.h"
 
 #ifdef __cplusplus
diff --git a/vp10/encoder/mips/msa/vp9_avg_msa.c b/vp10/encoder/mips/msa/avg_msa.c
index e8cfd53db..e8cfd53db 100644
--- a/vp10/encoder/mips/msa/vp9_avg_msa.c
+++ b/vp10/encoder/mips/msa/avg_msa.c
diff --git a/vp10/encoder/mips/msa/vp9_error_msa.c b/vp10/encoder/mips/msa/error_msa.c
index dacca32c0..dacca32c0 100644
--- a/vp10/encoder/mips/msa/vp9_error_msa.c
+++ b/vp10/encoder/mips/msa/error_msa.c
diff --git a/vp10/encoder/mips/msa/vp9_fdct16x16_msa.c b/vp10/encoder/mips/msa/fdct16x16_msa.c
index c031ab689..d78fc6473 100644
--- a/vp10/encoder/mips/msa/vp9_fdct16x16_msa.c
+++ b/vp10/encoder/mips/msa/fdct16x16_msa.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
 #include "vpx_dsp/mips/fwd_txfm_msa.h"
 
 static void fadst16_cols_step1_msa(const int16_t *input, int32_t stride,
diff --git a/vp10/encoder/mips/msa/vp9_fdct4x4_msa.c b/vp10/encoder/mips/msa/fdct4x4_msa.c
index e06bf724e..37269f0a4 100644
--- a/vp10/encoder/mips/msa/vp9_fdct4x4_msa.c
+++ b/vp10/encoder/mips/msa/fdct4x4_msa.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
 
 void vp10_fwht4x4_msa(const int16_t *input, int16_t *output,
                      int32_t src_stride) {
diff --git a/vp10/encoder/mips/msa/vp9_fdct8x8_msa.c b/vp10/encoder/mips/msa/fdct8x8_msa.c
index cf89daabb..4283eb946 100644
--- a/vp10/encoder/mips/msa/vp9_fdct8x8_msa.c
+++ b/vp10/encoder/mips/msa/fdct8x8_msa.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
 
 void vp10_fht8x8_msa(const int16_t *input, int16_t *output, int32_t stride,
                     int32_t tx_type) {
diff --git a/vp10/encoder/mips/msa/vp9_fdct_msa.h b/vp10/encoder/mips/msa/fdct_msa.h
index d7d40cb72..d7d40cb72 100644
--- a/vp10/encoder/mips/msa/vp9_fdct_msa.h
+++ b/vp10/encoder/mips/msa/fdct_msa.h
diff --git a/vp10/encoder/mips/msa/vp9_temporal_filter_msa.c b/vp10/encoder/mips/msa/temporal_filter_msa.c
index 5d4558b94..5d4558b94 100644
--- a/vp10/encoder/mips/msa/vp9_temporal_filter_msa.c
+++ b/vp10/encoder/mips/msa/temporal_filter_msa.c
diff --git a/vp10/encoder/vp9_picklpf.c b/vp10/encoder/picklpf.c
index b03437c39..f5139b01f 100644
--- a/vp10/encoder/vp9_picklpf.c
+++ b/vp10/encoder/picklpf.c
@@ -16,13 +16,13 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_quant_common.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/quant_common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_picklpf.h"
-#include "vp10/encoder/vp9_quantize.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/picklpf.h"
+#include "vp10/encoder/quantize.h"
 
 static int get_max_filter_level(const VP9_COMP *cpi) {
   if (cpi->oxcf.pass == 2) {
diff --git a/vp10/encoder/vp9_picklpf.h b/vp10/encoder/picklpf.h
index 500fd6888..ad45f7c74 100644
--- a/vp10/encoder/vp9_picklpf.h
+++ b/vp10/encoder/picklpf.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 struct yv12_buffer_config;
 struct VP9_COMP;
diff --git a/vp10/encoder/vp9_pickmode.c b/vp10/encoder/pickmode.c
index 1dcb1e774..61dc9364b 100644
--- a/vp10/encoder/vp9_pickmode.c
+++ b/vp10/encoder/pickmode.c
@@ -19,19 +19,19 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_pickmode.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/pickmode.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
 
 typedef struct {
   uint8_t *data;
diff --git a/vp10/encoder/vp9_pickmode.h b/vp10/encoder/pickmode.h
index 5ee56b1d7..b15127de8 100644
--- a/vp10/encoder/vp9_pickmode.h
+++ b/vp10/encoder/pickmode.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_PICKMODE_H_
 #define VP9_ENCODER_VP9_PICKMODE_H_
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_psnrhvs.c b/vp10/encoder/psnrhvs.c
index 828171c46..c91cbc19a 100644
--- a/vp10/encoder/vp9_psnrhvs.c
+++ b/vp10/encoder/psnrhvs.c
@@ -17,7 +17,7 @@
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 
 #if !defined(M_PI)
 # define M_PI (3.141592653589793238462643)
diff --git a/vp10/encoder/vp9_quantize.c b/vp10/encoder/quantize.c
index 35ff8096c..4c99e537a 100644
--- a/vp10/encoder/vp9_quantize.c
+++ b/vp10/encoder/quantize.c
@@ -13,12 +13,12 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
 
 void vp10_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
                        int skip_block,
diff --git a/vp10/encoder/vp9_quantize.h b/vp10/encoder/quantize.h
index fc7b64e04..462b155d1 100644
--- a/vp10/encoder/vp9_quantize.h
+++ b/vp10/encoder/quantize.h
@@ -12,7 +12,7 @@
 #define VP9_ENCODER_VP9_QUANTIZE_H_
 
 #include "./vpx_config.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_ratectrl.c b/vp10/encoder/ratectrl.c
index 02f6f24f0..a69504e71 100644
--- a/vp10/encoder/vp9_ratectrl.c
+++ b/vp10/encoder/ratectrl.c
@@ -18,16 +18,16 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/ratectrl.h"
 
 // Max rate target for 1080P and below encodes under normal circumstances
 // (1920 * 1080 / (16 * 16)) * MAX_MB_RATE bits per MB
diff --git a/vp10/encoder/vp9_ratectrl.h b/vp10/encoder/ratectrl.h
index e18d199ab..28a3d519a 100644
--- a/vp10/encoder/vp9_ratectrl.h
+++ b/vp10/encoder/ratectrl.h
@@ -15,7 +15,7 @@
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_rd.c b/vp10/encoder/rd.c
index f8f7e123d..74a63f95e 100644
--- a/vp10/encoder/vp9_rd.c
+++ b/vp10/encoder/rd.c
@@ -17,26 +17,26 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/tokenize.h"
 
 #define RD_THRESH_POW      1.25
 #define RD_MULT_EPB_RATIO  64
diff --git a/vp10/encoder/vp9_rd.h b/vp10/encoder/rd.h
index 2132db35b..8f2d20b9a 100644
--- a/vp10/encoder/vp9_rd.h
+++ b/vp10/encoder/rd.h
@@ -13,10 +13,10 @@
 
 #include <limits.h>
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_context_tree.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/context_tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_rdopt.c b/vp10/encoder/rdopt.c
index 284a9d283..343d6f236 100644
--- a/vp10/encoder/vp9_rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -17,29 +17,29 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_rdopt.h"
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/rdopt.h"
+#include "vp10/encoder/aq_variance.h"
 
 #define LAST_FRAME_MODE_MASK    ((1 << GOLDEN_FRAME) | (1 << ALTREF_FRAME) | \
                                  (1 << INTRA_FRAME))
diff --git a/vp10/encoder/vp9_rdopt.h b/vp10/encoder/rdopt.h
index 8c1e86941..8047b93c0 100644
--- a/vp10/encoder/vp9_rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -11,10 +11,10 @@
 #ifndef VP9_ENCODER_VP9_RDOPT_H_
 #define VP9_ENCODER_VP9_RDOPT_H_
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_context_tree.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/context_tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_resize.c b/vp10/encoder/resize.c
index 940370016..5e17532a9 100644
--- a/vp10/encoder/vp9_resize.c
+++ b/vp10/encoder/resize.c
@@ -19,8 +19,8 @@
 #include "vpx_dsp/vpx_dsp_common.h"
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 #include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/encoder/vp9_resize.h"
+#include "vp10/common/common.h"
+#include "vp10/encoder/resize.h"
 
 #define FILTER_BITS               7
 
diff --git a/vp10/encoder/vp9_resize.h b/vp10/encoder/resize.h
index a0b59dfd3..a0b59dfd3 100644
--- a/vp10/encoder/vp9_resize.h
+++ b/vp10/encoder/resize.h
diff --git a/vp10/encoder/vp9_segmentation.c b/vp10/encoder/segmentation.c
index 22006d3b0..86a970288 100644
--- a/vp10/encoder/vp9_segmentation.c
+++ b/vp10/encoder/segmentation.c
@@ -13,11 +13,11 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/tile_common.h"
 
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/segmentation.h"
 
 void vp10_enable_segmentation(struct segmentation *seg) {
   seg->enabled = 1;
diff --git a/vp10/encoder/vp9_segmentation.h b/vp10/encoder/segmentation.h
index 056a9f4c5..85e4fe6e9 100644
--- a/vp10/encoder/vp9_segmentation.h
+++ b/vp10/encoder/segmentation.h
@@ -12,8 +12,8 @@
 #ifndef VP9_ENCODER_VP9_SEGMENTATION_H_
 #define VP9_ENCODER_VP9_SEGMENTATION_H_
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_skin_detection.c b/vp10/encoder/skin_detection.c
index f988cb98e..e37ea260c 100644
--- a/vp10/encoder/vp9_skin_detection.c
+++ b/vp10/encoder/skin_detection.c
@@ -11,9 +11,9 @@
 #include <limits.h>
 #include <math.h>
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_skin_detection.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/skin_detection.h"
 
 // Fixed-point skin color model parameters.
 static const int skin_mean[2] = {7463, 9614};                 // q6
diff --git a/vp10/encoder/vp9_skin_detection.h b/vp10/encoder/skin_detection.h
index e30437b70..acfc8f119 100644
--- a/vp10/encoder/vp9_skin_detection.h
+++ b/vp10/encoder/skin_detection.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_SKIN_MAP_H_
 #define VP9_ENCODER_VP9_SKIN_MAP_H_
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_speed_features.c b/vp10/encoder/speed_features.c
index aaff47fe3..b428e31dc 100644
--- a/vp10/encoder/vp9_speed_features.c
+++ b/vp10/encoder/speed_features.c
@@ -10,9 +10,9 @@
 
 #include <limits.h>
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_speed_features.h"
-#include "vp10/encoder/vp9_rdopt.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/speed_features.h"
+#include "vp10/encoder/rdopt.h"
 
 
 // Intra only frames, golden frames (except alt ref overlays) and
diff --git a/vp10/encoder/vp9_speed_features.h b/vp10/encoder/speed_features.h
index d0b1210f8..32e8a5d77 100644
--- a/vp10/encoder/vp9_speed_features.h
+++ b/vp10/encoder/speed_features.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_SPEED_FEATURES_H_
 #define VP9_ENCODER_VP9_SPEED_FEATURES_H_
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_ssim.c b/vp10/encoder/ssim.c
index 3fb77ca73..0219621d6 100644
--- a/vp10/encoder/vp9_ssim.c
+++ b/vp10/encoder/ssim.c
@@ -11,7 +11,7 @@
 #include <math.h>
 #include "./vp10_rtcd.h"
 #include "vpx_ports/mem.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 
 void vp10_ssim_parms_16x16_c(uint8_t *s, int sp, uint8_t *r,
                             int rp, unsigned long *sum_s, unsigned long *sum_r,
diff --git a/vp10/encoder/vp9_ssim.h b/vp10/encoder/ssim.h
index ca0551a94..ca0551a94 100644
--- a/vp10/encoder/vp9_ssim.h
+++ b/vp10/encoder/ssim.h
diff --git a/vp10/encoder/vp9_subexp.c b/vp10/encoder/subexp.c
index 41117bbd8..fd0b09b69 100644
--- a/vp10/encoder/vp9_subexp.c
+++ b/vp10/encoder/subexp.c
@@ -9,10 +9,10 @@
  */
 #include "vpx_dsp/bitwriter.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_subexp.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/subexp.h"
 
 #define vp10_cost_upd256  ((int)(vp10_cost_one(upd) - vp10_cost_zero(upd)))
 
diff --git a/vp10/encoder/vp9_subexp.h b/vp10/encoder/subexp.h
index 5f4d613db..5f4d613db 100644
--- a/vp10/encoder/vp9_subexp.h
+++ b/vp10/encoder/subexp.h
diff --git a/vp10/encoder/vp9_svc_layercontext.c b/vp10/encoder/svc_layercontext.c
index 616202d2e..321ae8396 100644
--- a/vp10/encoder/vp9_svc_layercontext.c
+++ b/vp10/encoder/svc_layercontext.c
@@ -10,9 +10,9 @@
 
 #include <math.h>
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_extend.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/extend.h"
 
 #define SMALL_FRAME_FB_IDX 7
 #define SMALL_FRAME_WIDTH  16
diff --git a/vp10/encoder/vp9_svc_layercontext.h b/vp10/encoder/svc_layercontext.h
index 9564de69d..41cb9e69b 100644
--- a/vp10/encoder/vp9_svc_layercontext.h
+++ b/vp10/encoder/svc_layercontext.h
@@ -13,7 +13,7 @@
 
 #include "vpx/vpx_encoder.h"
 
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/encoder/ratectrl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_temporal_filter.c b/vp10/encoder/temporal_filter.c
index 1e5bdf603..82e785496 100644
--- a/vp10/encoder/vp9_temporal_filter.c
+++ b/vp10/encoder/temporal_filter.c
@@ -11,19 +11,19 @@
 #include <math.h>
 #include <limits.h>
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_temporal_filter.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/temporal_filter.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
diff --git a/vp10/encoder/vp9_temporal_filter.h b/vp10/encoder/temporal_filter.h
index 496662679..496662679 100644
--- a/vp10/encoder/vp9_temporal_filter.h
+++ b/vp10/encoder/temporal_filter.h
diff --git a/vp10/encoder/vp9_tokenize.c b/vp10/encoder/tokenize.c
index eb3c74ff3..2df9c46a3 100644
--- a/vp10/encoder/vp9_tokenize.c
+++ b/vp10/encoder/tokenize.c
@@ -15,14 +15,14 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_seg_common.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/seg_common.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/tokenize.h"
 
 static const TOKENVALUE dct_cat_lt_10_value_tokens[] = {
   {9, 63}, {9, 61}, {9, 59}, {9, 57}, {9, 55}, {9, 53}, {9, 51}, {9, 49},
diff --git a/vp10/encoder/vp9_tokenize.h b/vp10/encoder/tokenize.h
index 82544b473..1e8df82a5 100644
--- a/vp10/encoder/vp9_tokenize.h
+++ b/vp10/encoder/tokenize.h
@@ -11,10 +11,10 @@
 #ifndef VP9_ENCODER_VP9_TOKENIZE_H_
 #define VP9_ENCODER_VP9_TOKENIZE_H_
 
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
 
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_treewriter.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/treewriter.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/encoder/vp9_treewriter.c b/vp10/encoder/treewriter.c
index 025d7225a..1f42f32a1 100644
--- a/vp10/encoder/vp9_treewriter.c
+++ b/vp10/encoder/treewriter.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/encoder/vp9_treewriter.h"
+#include "vp10/encoder/treewriter.h"
 
 static void tree2tok(struct vp10_token *tokens, const vpx_tree_index *tree,
                      int i, int v, int l) {
diff --git a/vp10/encoder/vp9_treewriter.h b/vp10/encoder/treewriter.h
index 8c8029e73..8c8029e73 100644
--- a/vp10/encoder/vp9_treewriter.h
+++ b/vp10/encoder/treewriter.h
diff --git a/vp10/encoder/x86/vp9_avg_intrin_sse2.c b/vp10/encoder/x86/avg_intrin_sse2.c
index cf23013f9..cf23013f9 100644
--- a/vp10/encoder/x86/vp9_avg_intrin_sse2.c
+++ b/vp10/encoder/x86/avg_intrin_sse2.c
diff --git a/vp10/encoder/x86/vp9_dct_mmx.asm b/vp10/encoder/x86/dct_mmx.asm
index 2327fe9e6..2327fe9e6 100644
--- a/vp10/encoder/x86/vp9_dct_mmx.asm
+++ b/vp10/encoder/x86/dct_mmx.asm
diff --git a/vp10/encoder/x86/vp9_dct_sse2.c b/vp10/encoder/x86/dct_sse2.c
index e1111570a..e1111570a 100644
--- a/vp10/encoder/x86/vp9_dct_sse2.c
+++ b/vp10/encoder/x86/dct_sse2.c
diff --git a/vp10/encoder/x86/vp9_dct_ssse3.c b/vp10/encoder/x86/dct_ssse3.c
index df298d871..df298d871 100644
--- a/vp10/encoder/x86/vp9_dct_ssse3.c
+++ b/vp10/encoder/x86/dct_ssse3.c
diff --git a/vp10/encoder/x86/vp9_dct_ssse3_x86_64.asm b/vp10/encoder/x86/dct_ssse3_x86_64.asm
index 5e8adab3d..5e8adab3d 100644
--- a/vp10/encoder/x86/vp9_dct_ssse3_x86_64.asm
+++ b/vp10/encoder/x86/dct_ssse3_x86_64.asm
diff --git a/vp10/encoder/x86/vp9_denoiser_sse2.c b/vp10/encoder/x86/denoiser_sse2.c
index 723681c40..047974ef8 100644
--- a/vp10/encoder/x86/vp9_denoiser_sse2.c
+++ b/vp10/encoder/x86/denoiser_sse2.c
@@ -15,9 +15,9 @@
 
 #include "vpx_ports/emmintrin_compat.h"
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/denoiser.h"
 #include "vpx_mem/vpx_mem.h"
 
 // Compute the sum of all pixel differences of this MB.
diff --git a/vp10/encoder/x86/vp9_error_intrin_avx2.c b/vp10/encoder/x86/error_intrin_avx2.c
index 9766be27b..9766be27b 100644
--- a/vp10/encoder/x86/vp9_error_intrin_avx2.c
+++ b/vp10/encoder/x86/error_intrin_avx2.c
diff --git a/vp10/encoder/x86/vp9_error_sse2.asm b/vp10/encoder/x86/error_sse2.asm
index 0772da418..0772da418 100644
--- a/vp10/encoder/x86/vp9_error_sse2.asm
+++ b/vp10/encoder/x86/error_sse2.asm
diff --git a/vp10/encoder/x86/vp9_highbd_block_error_intrin_sse2.c b/vp10/encoder/x86/highbd_block_error_intrin_sse2.c
index f57fefc40..6b4cf5099 100644
--- a/vp10/encoder/x86/vp9_highbd_block_error_intrin_sse2.c
+++ b/vp10/encoder/x86/highbd_block_error_intrin_sse2.c
@@ -11,7 +11,7 @@
 #include <emmintrin.h>
 #include <stdio.h>
 
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 int64_t vp10_highbd_block_error_sse2(tran_low_t *coeff, tran_low_t *dqcoeff,
                                     intptr_t block_size, int64_t *ssz,
diff --git a/vp10/encoder/x86/vp9_quantize_sse2.c b/vp10/encoder/x86/quantize_sse2.c
index dabd3bd12..dabd3bd12 100644
--- a/vp10/encoder/x86/vp9_quantize_sse2.c
+++ b/vp10/encoder/x86/quantize_sse2.c
diff --git a/vp10/encoder/x86/vp9_quantize_ssse3_x86_64.asm b/vp10/encoder/x86/quantize_ssse3_x86_64.asm
index b8fefa2f1..b8fefa2f1 100644
--- a/vp10/encoder/x86/vp9_quantize_ssse3_x86_64.asm
+++ b/vp10/encoder/x86/quantize_ssse3_x86_64.asm
diff --git a/vp10/encoder/x86/vp9_ssim_opt_x86_64.asm b/vp10/encoder/x86/ssim_opt_x86_64.asm
index b45f0095d..b45f0095d 100644
--- a/vp10/encoder/x86/vp9_ssim_opt_x86_64.asm
+++ b/vp10/encoder/x86/ssim_opt_x86_64.asm
diff --git a/vp10/encoder/x86/vp9_temporal_filter_apply_sse2.asm b/vp10/encoder/x86/temporal_filter_apply_sse2.asm
index 717180713..717180713 100644
--- a/vp10/encoder/x86/vp9_temporal_filter_apply_sse2.asm
+++ b/vp10/encoder/x86/temporal_filter_apply_sse2.asm
diff --git a/vp10/vp10_common.mk b/vp10/vp10_common.mk
index 587e1750c..c0f5ae98a 100644
--- a/vp10/vp10_common.mk
+++ b/vp10/vp10_common.mk
@@ -10,87 +10,87 @@
 
 VP10_COMMON_SRCS-yes += vp10_common.mk
 VP10_COMMON_SRCS-yes += vp10_iface_common.h
-VP10_COMMON_SRCS-yes += common/vp9_ppflags.h
-VP10_COMMON_SRCS-yes += common/vp9_alloccommon.c
-VP10_COMMON_SRCS-yes += common/vp9_blockd.c
-VP10_COMMON_SRCS-yes += common/vp9_debugmodes.c
-VP10_COMMON_SRCS-yes += common/vp9_entropy.c
-VP10_COMMON_SRCS-yes += common/vp9_entropymode.c
-VP10_COMMON_SRCS-yes += common/vp9_entropymv.c
-VP10_COMMON_SRCS-yes += common/vp9_frame_buffers.c
-VP10_COMMON_SRCS-yes += common/vp9_frame_buffers.h
-VP10_COMMON_SRCS-yes += common/vp9_idct.c
-VP10_COMMON_SRCS-yes += common/vp9_alloccommon.h
-VP10_COMMON_SRCS-yes += common/vp9_blockd.h
-VP10_COMMON_SRCS-yes += common/vp9_common.h
-VP10_COMMON_SRCS-yes += common/vp9_entropy.h
-VP10_COMMON_SRCS-yes += common/vp9_entropymode.h
-VP10_COMMON_SRCS-yes += common/vp9_entropymv.h
-VP10_COMMON_SRCS-yes += common/vp9_enums.h
-VP10_COMMON_SRCS-yes += common/vp9_filter.h
-VP10_COMMON_SRCS-yes += common/vp9_filter.c
-VP10_COMMON_SRCS-yes += common/vp9_idct.h
-VP10_COMMON_SRCS-yes += common/vp9_loopfilter.h
-VP10_COMMON_SRCS-yes += common/vp9_thread_common.h
-VP10_COMMON_SRCS-yes += common/vp9_mv.h
-VP10_COMMON_SRCS-yes += common/vp9_onyxc_int.h
-VP10_COMMON_SRCS-yes += common/vp9_pred_common.h
-VP10_COMMON_SRCS-yes += common/vp9_pred_common.c
-VP10_COMMON_SRCS-yes += common/vp9_quant_common.h
-VP10_COMMON_SRCS-yes += common/vp9_reconinter.h
-VP10_COMMON_SRCS-yes += common/vp9_reconintra.h
+VP10_COMMON_SRCS-yes += common/ppflags.h
+VP10_COMMON_SRCS-yes += common/alloccommon.c
+VP10_COMMON_SRCS-yes += common/blockd.c
+VP10_COMMON_SRCS-yes += common/debugmodes.c
+VP10_COMMON_SRCS-yes += common/entropy.c
+VP10_COMMON_SRCS-yes += common/entropymode.c
+VP10_COMMON_SRCS-yes += common/entropymv.c
+VP10_COMMON_SRCS-yes += common/frame_buffers.c
+VP10_COMMON_SRCS-yes += common/frame_buffers.h
+VP10_COMMON_SRCS-yes += common/idct.c
+VP10_COMMON_SRCS-yes += common/alloccommon.h
+VP10_COMMON_SRCS-yes += common/blockd.h
+VP10_COMMON_SRCS-yes += common/common.h
+VP10_COMMON_SRCS-yes += common/entropy.h
+VP10_COMMON_SRCS-yes += common/entropymode.h
+VP10_COMMON_SRCS-yes += common/entropymv.h
+VP10_COMMON_SRCS-yes += common/enums.h
+VP10_COMMON_SRCS-yes += common/filter.h
+VP10_COMMON_SRCS-yes += common/filter.c
+VP10_COMMON_SRCS-yes += common/idct.h
+VP10_COMMON_SRCS-yes += common/loopfilter.h
+VP10_COMMON_SRCS-yes += common/thread_common.h
+VP10_COMMON_SRCS-yes += common/mv.h
+VP10_COMMON_SRCS-yes += common/onyxc_int.h
+VP10_COMMON_SRCS-yes += common/pred_common.h
+VP10_COMMON_SRCS-yes += common/pred_common.c
+VP10_COMMON_SRCS-yes += common/quant_common.h
+VP10_COMMON_SRCS-yes += common/reconinter.h
+VP10_COMMON_SRCS-yes += common/reconintra.h
 VP10_COMMON_SRCS-yes += common/vp10_rtcd.c
 VP10_COMMON_SRCS-yes += common/vp10_rtcd_defs.pl
-VP10_COMMON_SRCS-yes += common/vp9_scale.h
-VP10_COMMON_SRCS-yes += common/vp9_scale.c
-VP10_COMMON_SRCS-yes += common/vp9_seg_common.h
-VP10_COMMON_SRCS-yes += common/vp9_seg_common.c
-VP10_COMMON_SRCS-yes += common/vp9_systemdependent.h
-VP10_COMMON_SRCS-yes += common/vp9_textblit.h
-VP10_COMMON_SRCS-yes += common/vp9_tile_common.h
-VP10_COMMON_SRCS-yes += common/vp9_tile_common.c
-VP10_COMMON_SRCS-yes += common/vp9_loopfilter.c
-VP10_COMMON_SRCS-yes += common/vp9_thread_common.c
-VP10_COMMON_SRCS-yes += common/vp9_mvref_common.c
-VP10_COMMON_SRCS-yes += common/vp9_mvref_common.h
-VP10_COMMON_SRCS-yes += common/vp9_quant_common.c
-VP10_COMMON_SRCS-yes += common/vp9_reconinter.c
-VP10_COMMON_SRCS-yes += common/vp9_reconintra.c
-VP10_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/vp9_textblit.c
-VP10_COMMON_SRCS-yes += common/vp9_common_data.c
-VP10_COMMON_SRCS-yes += common/vp9_common_data.h
-VP10_COMMON_SRCS-yes += common/vp9_scan.c
-VP10_COMMON_SRCS-yes += common/vp9_scan.h
+VP10_COMMON_SRCS-yes += common/scale.h
+VP10_COMMON_SRCS-yes += common/scale.c
+VP10_COMMON_SRCS-yes += common/seg_common.h
+VP10_COMMON_SRCS-yes += common/seg_common.c
+VP10_COMMON_SRCS-yes += common/systemdependent.h
+VP10_COMMON_SRCS-yes += common/textblit.h
+VP10_COMMON_SRCS-yes += common/tile_common.h
+VP10_COMMON_SRCS-yes += common/tile_common.c
+VP10_COMMON_SRCS-yes += common/loopfilter.c
+VP10_COMMON_SRCS-yes += common/thread_common.c
+VP10_COMMON_SRCS-yes += common/mvref_common.c
+VP10_COMMON_SRCS-yes += common/mvref_common.h
+VP10_COMMON_SRCS-yes += common/quant_common.c
+VP10_COMMON_SRCS-yes += common/reconinter.c
+VP10_COMMON_SRCS-yes += common/reconintra.c
+VP10_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c
+VP10_COMMON_SRCS-yes += common/common_data.c
+VP10_COMMON_SRCS-yes += common/common_data.h
+VP10_COMMON_SRCS-yes += common/scan.c
+VP10_COMMON_SRCS-yes += common/scan.h
 
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_postproc.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_postproc.c
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_mfqe.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_mfqe.c
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/postproc.h
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/postproc.c
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/mfqe.h
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/mfqe.c
 ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_mfqe_sse2.asm
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_postproc_sse2.asm
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/mfqe_sse2.asm
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
 endif
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans4_dspr2.c
-VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans8_dspr2.c
-VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans16_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans4_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans8_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans16_dspr2.c
 endif
 
 # common (msa)
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct4x4_msa.c
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct8x8_msa.c
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct16x16_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct4x4_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct8x8_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct16x16_msa.c
 
 ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_mfqe_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/mfqe_msa.c
 endif
 
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_idct_intrin_sse2.c
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_intrin_sse2.c
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_iht4x4_add_neon.c
-VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_iht8x8_add_neon.c
+VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht4x4_add_neon.c
+VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht8x8_add_neon.c
 endif
 
 $(eval $(call rtcd_h_template,vp10_rtcd,vp10/common/vp10_rtcd_defs.pl))
diff --git a/vp10/vp10_cx_iface.c b/vp10/vp10_cx_iface.c
index 3709c1a63..b3557574a 100644
--- a/vp10/vp10_cx_iface.c
+++ b/vp10/vp10_cx_iface.c
@@ -16,9 +16,9 @@
 #include "vpx_ports/vpx_once.h"
 #include "vpx/internal/vpx_codec_internal.h"
 #include "./vpx_version.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 #include "vpx/vp8cx.h"
-#include "vp10/encoder/vp9_firstpass.h"
+#include "vp10/encoder/firstpass.h"
 #include "vp10/vp10_iface_common.h"
 
 struct vp10_extracfg {
diff --git a/vp10/vp10_dx_iface.c b/vp10/vp10_dx_iface.c
index ec439429a..9be2bf705 100644
--- a/vp10/vp10_dx_iface.c
+++ b/vp10/vp10_dx_iface.c
@@ -20,11 +20,11 @@
 #include "vpx_dsp/bitreader_buffer.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_frame_buffers.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/frame_buffers.h"
 
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/decodeframe.h"
 
 #include "vp10/vp10_iface_common.h"
 
diff --git a/vp10/vp10cx.mk b/vp10/vp10cx.mk
index 84b6cd359..d6846b257 100644
--- a/vp10/vp10cx.mk
+++ b/vp10/vp10cx.mk
@@ -17,126 +17,126 @@ VP10_CX_SRCS_REMOVE-no  += $(VP10_COMMON_SRCS_REMOVE-no)
 
 VP10_CX_SRCS-yes += vp10_cx_iface.c
 
-VP10_CX_SRCS-yes += encoder/vp9_avg.c
-VP10_CX_SRCS-yes += encoder/vp9_bitstream.c
-VP10_CX_SRCS-yes += encoder/vp9_context_tree.c
-VP10_CX_SRCS-yes += encoder/vp9_context_tree.h
-VP10_CX_SRCS-yes += encoder/vp9_cost.h
-VP10_CX_SRCS-yes += encoder/vp9_cost.c
-VP10_CX_SRCS-yes += encoder/vp9_dct.c
-VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.c
-VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.h
-VP10_CX_SRCS-yes += encoder/vp9_encodeframe.c
-VP10_CX_SRCS-yes += encoder/vp9_encodeframe.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemb.c
-VP10_CX_SRCS-yes += encoder/vp9_encodemv.c
-VP10_CX_SRCS-yes += encoder/vp9_ethread.h
-VP10_CX_SRCS-yes += encoder/vp9_ethread.c
-VP10_CX_SRCS-yes += encoder/vp9_extend.c
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_fastssim.c
-VP10_CX_SRCS-yes += encoder/vp9_firstpass.c
-VP10_CX_SRCS-yes += encoder/vp9_block.h
-VP10_CX_SRCS-yes += encoder/vp9_bitstream.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemb.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemv.h
-VP10_CX_SRCS-yes += encoder/vp9_extend.h
-VP10_CX_SRCS-yes += encoder/vp9_firstpass.h
-VP10_CX_SRCS-yes += encoder/vp9_lookahead.c
-VP10_CX_SRCS-yes += encoder/vp9_lookahead.h
-VP10_CX_SRCS-yes += encoder/vp9_mcomp.h
-VP10_CX_SRCS-yes += encoder/vp9_encoder.h
-VP10_CX_SRCS-yes += encoder/vp9_quantize.h
-VP10_CX_SRCS-yes += encoder/vp9_ratectrl.h
-VP10_CX_SRCS-yes += encoder/vp9_rd.h
-VP10_CX_SRCS-yes += encoder/vp9_rdopt.h
-VP10_CX_SRCS-yes += encoder/vp9_pickmode.h
-VP10_CX_SRCS-yes += encoder/vp9_svc_layercontext.h
-VP10_CX_SRCS-yes += encoder/vp9_tokenize.h
-VP10_CX_SRCS-yes += encoder/vp9_treewriter.h
-VP10_CX_SRCS-yes += encoder/vp9_mcomp.c
-VP10_CX_SRCS-yes += encoder/vp9_encoder.c
-VP10_CX_SRCS-yes += encoder/vp9_picklpf.c
-VP10_CX_SRCS-yes += encoder/vp9_picklpf.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_psnrhvs.c
-VP10_CX_SRCS-yes += encoder/vp9_quantize.c
-VP10_CX_SRCS-yes += encoder/vp9_ratectrl.c
-VP10_CX_SRCS-yes += encoder/vp9_rd.c
-VP10_CX_SRCS-yes += encoder/vp9_rdopt.c
-VP10_CX_SRCS-yes += encoder/vp9_pickmode.c
-VP10_CX_SRCS-yes += encoder/vp9_segmentation.c
-VP10_CX_SRCS-yes += encoder/vp9_segmentation.h
-VP10_CX_SRCS-yes += encoder/vp9_speed_features.c
-VP10_CX_SRCS-yes += encoder/vp9_speed_features.h
-VP10_CX_SRCS-yes += encoder/vp9_subexp.c
-VP10_CX_SRCS-yes += encoder/vp9_subexp.h
-VP10_CX_SRCS-yes += encoder/vp9_svc_layercontext.c
-VP10_CX_SRCS-yes += encoder/vp9_resize.c
-VP10_CX_SRCS-yes += encoder/vp9_resize.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_blockiness.c
+VP10_CX_SRCS-yes += encoder/avg.c
+VP10_CX_SRCS-yes += encoder/bitstream.c
+VP10_CX_SRCS-yes += encoder/context_tree.c
+VP10_CX_SRCS-yes += encoder/context_tree.h
+VP10_CX_SRCS-yes += encoder/cost.h
+VP10_CX_SRCS-yes += encoder/cost.c
+VP10_CX_SRCS-yes += encoder/dct.c
+VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.c
+VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.h
+VP10_CX_SRCS-yes += encoder/encodeframe.c
+VP10_CX_SRCS-yes += encoder/encodeframe.h
+VP10_CX_SRCS-yes += encoder/encodemb.c
+VP10_CX_SRCS-yes += encoder/encodemv.c
+VP10_CX_SRCS-yes += encoder/ethread.h
+VP10_CX_SRCS-yes += encoder/ethread.c
+VP10_CX_SRCS-yes += encoder/extend.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/fastssim.c
+VP10_CX_SRCS-yes += encoder/firstpass.c
+VP10_CX_SRCS-yes += encoder/block.h
+VP10_CX_SRCS-yes += encoder/bitstream.h
+VP10_CX_SRCS-yes += encoder/encodemb.h
+VP10_CX_SRCS-yes += encoder/encodemv.h
+VP10_CX_SRCS-yes += encoder/extend.h
+VP10_CX_SRCS-yes += encoder/firstpass.h
+VP10_CX_SRCS-yes += encoder/lookahead.c
+VP10_CX_SRCS-yes += encoder/lookahead.h
+VP10_CX_SRCS-yes += encoder/mcomp.h
+VP10_CX_SRCS-yes += encoder/encoder.h
+VP10_CX_SRCS-yes += encoder/quantize.h
+VP10_CX_SRCS-yes += encoder/ratectrl.h
+VP10_CX_SRCS-yes += encoder/rd.h
+VP10_CX_SRCS-yes += encoder/rdopt.h
+VP10_CX_SRCS-yes += encoder/pickmode.h
+VP10_CX_SRCS-yes += encoder/svc_layercontext.h
+VP10_CX_SRCS-yes += encoder/tokenize.h
+VP10_CX_SRCS-yes += encoder/treewriter.h
+VP10_CX_SRCS-yes += encoder/mcomp.c
+VP10_CX_SRCS-yes += encoder/encoder.c
+VP10_CX_SRCS-yes += encoder/picklpf.c
+VP10_CX_SRCS-yes += encoder/picklpf.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/psnrhvs.c
+VP10_CX_SRCS-yes += encoder/quantize.c
+VP10_CX_SRCS-yes += encoder/ratectrl.c
+VP10_CX_SRCS-yes += encoder/rd.c
+VP10_CX_SRCS-yes += encoder/rdopt.c
+VP10_CX_SRCS-yes += encoder/pickmode.c
+VP10_CX_SRCS-yes += encoder/segmentation.c
+VP10_CX_SRCS-yes += encoder/segmentation.h
+VP10_CX_SRCS-yes += encoder/speed_features.c
+VP10_CX_SRCS-yes += encoder/speed_features.h
+VP10_CX_SRCS-yes += encoder/subexp.c
+VP10_CX_SRCS-yes += encoder/subexp.h
+VP10_CX_SRCS-yes += encoder/svc_layercontext.c
+VP10_CX_SRCS-yes += encoder/resize.c
+VP10_CX_SRCS-yes += encoder/resize.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/blockiness.c
 
-VP10_CX_SRCS-yes += encoder/vp9_tokenize.c
-VP10_CX_SRCS-yes += encoder/vp9_treewriter.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_variance.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_variance.h
-VP10_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.h
-VP10_CX_SRCS-yes += encoder/vp9_aq_complexity.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_complexity.h
-VP10_CX_SRCS-yes += encoder/vp9_skin_detection.c
-VP10_CX_SRCS-yes += encoder/vp9_skin_detection.h
+VP10_CX_SRCS-yes += encoder/tokenize.c
+VP10_CX_SRCS-yes += encoder/treewriter.c
+VP10_CX_SRCS-yes += encoder/aq_variance.c
+VP10_CX_SRCS-yes += encoder/aq_variance.h
+VP10_CX_SRCS-yes += encoder/aq_cyclicrefresh.c
+VP10_CX_SRCS-yes += encoder/aq_cyclicrefresh.h
+VP10_CX_SRCS-yes += encoder/aq_complexity.c
+VP10_CX_SRCS-yes += encoder/aq_complexity.h
+VP10_CX_SRCS-yes += encoder/skin_detection.c
+VP10_CX_SRCS-yes += encoder/skin_detection.h
 ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c
 endif
-VP10_CX_SRCS-yes += encoder/vp9_temporal_filter.c
-VP10_CX_SRCS-yes += encoder/vp9_temporal_filter.h
-VP10_CX_SRCS-yes += encoder/vp9_mbgraph.c
-VP10_CX_SRCS-yes += encoder/vp9_mbgraph.h
+VP10_CX_SRCS-yes += encoder/temporal_filter.c
+VP10_CX_SRCS-yes += encoder/temporal_filter.h
+VP10_CX_SRCS-yes += encoder/mbgraph.c
+VP10_CX_SRCS-yes += encoder/mbgraph.h
 
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_avg_intrin_sse2.c
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/avg_intrin_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
 ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_block_error_intrin_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/highbd_block_error_intrin_sse2.c
 endif
 
 ifeq ($(CONFIG_USE_X86INC),yes)
-VP10_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm
+VP10_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/error_sse2.asm
 endif
 
 ifeq ($(ARCH_X86_64),yes)
 ifeq ($(CONFIG_USE_X86INC),yes)
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3_x86_64.asm
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3_x86_64.asm
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3_x86_64.asm
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3_x86_64.asm
 endif
 endif
-VP10_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt_x86_64.asm
+VP10_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt_x86_64.asm
 
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.c
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3.c
 
 ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes)
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_denoiser_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoiser_sse2.c
 endif
 
-VP10_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_error_intrin_avx2.c
+VP10_CX_SRCS-$(HAVE_AVX2) += encoder/x86/error_intrin_avx2.c
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_dct_neon.c
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_error_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/dct_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/error_neon.c
 endif
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_avg_neon.c
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_quantize_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/avg_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/quantize_neon.c
 
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_avg_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_error_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct4x4_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct8x8_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct16x16_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct_msa.h
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_temporal_filter_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/avg_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/error_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct4x4_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct8x8_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct16x16_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct_msa.h
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c
 
 VP10_CX_SRCS-yes := $(filter-out $(VP10_CX_SRCS_REMOVE-yes),$(VP10_CX_SRCS-yes))
diff --git a/vp10/vp10dx.mk b/vp10/vp10dx.mk
index e24f2ca79..fce6d0d7d 100644
--- a/vp10/vp10dx.mk
+++ b/vp10/vp10dx.mk
@@ -17,17 +17,17 @@ VP10_DX_SRCS_REMOVE-no  += $(VP10_COMMON_SRCS_REMOVE-no)
 
 VP10_DX_SRCS-yes += vp10_dx_iface.c
 
-VP10_DX_SRCS-yes += decoder/vp9_decodemv.c
-VP10_DX_SRCS-yes += decoder/vp9_decodeframe.c
-VP10_DX_SRCS-yes += decoder/vp9_decodeframe.h
-VP10_DX_SRCS-yes += decoder/vp9_detokenize.c
-VP10_DX_SRCS-yes += decoder/vp9_decodemv.h
-VP10_DX_SRCS-yes += decoder/vp9_detokenize.h
-VP10_DX_SRCS-yes += decoder/vp9_dthread.c
-VP10_DX_SRCS-yes += decoder/vp9_dthread.h
-VP10_DX_SRCS-yes += decoder/vp9_decoder.c
-VP10_DX_SRCS-yes += decoder/vp9_decoder.h
-VP10_DX_SRCS-yes += decoder/vp9_dsubexp.c
-VP10_DX_SRCS-yes += decoder/vp9_dsubexp.h
+VP10_DX_SRCS-yes += decoder/decodemv.c
+VP10_DX_SRCS-yes += decoder/decodeframe.c
+VP10_DX_SRCS-yes += decoder/decodeframe.h
+VP10_DX_SRCS-yes += decoder/detokenize.c
+VP10_DX_SRCS-yes += decoder/decodemv.h
+VP10_DX_SRCS-yes += decoder/detokenize.h
+VP10_DX_SRCS-yes += decoder/dthread.c
+VP10_DX_SRCS-yes += decoder/dthread.h
+VP10_DX_SRCS-yes += decoder/decoder.c
+VP10_DX_SRCS-yes += decoder/decoder.h
+VP10_DX_SRCS-yes += decoder/dsubexp.c
+VP10_DX_SRCS-yes += decoder/dsubexp.h
 
 VP10_DX_SRCS-yes := $(filter-out $(VP10_DX_SRCS_REMOVE-yes),$(VP10_DX_SRCS-yes))