diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfa4de50a8085eaf4d614e0525be1bc1464dda98..2626f2c601879d8537c24224ae0ddd0549552173 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,6 +192,8 @@ set(AOM_AV1_COMMON_SOURCES
     "${AOM_ROOT}/av1/common/av1_inv_txfm1d.h"
     "${AOM_ROOT}/av1/common/av1_inv_txfm2d.c"
     "${AOM_ROOT}/av1/common/av1_inv_txfm2d_cfg.h"
+    "${AOM_ROOT}/av1/common/av1_loopfilter.c"
+    "${AOM_ROOT}/av1/common/av1_loopfilter.h"
     "${AOM_ROOT}/av1/common/av1_rtcd.c"
     "${AOM_ROOT}/av1/common/av1_txfm.h"
     "${AOM_ROOT}/av1/common/blockd.c"
@@ -214,8 +216,6 @@ set(AOM_AV1_COMMON_SOURCES
     "${AOM_ROOT}/av1/common/frame_buffers.h"
     "${AOM_ROOT}/av1/common/idct.c"
     "${AOM_ROOT}/av1/common/idct.h"
-    "${AOM_ROOT}/av1/common/loopfilter.c"
-    "${AOM_ROOT}/av1/common/loopfilter.h"
     "${AOM_ROOT}/av1/common/mv.h"
     "${AOM_ROOT}/av1/common/mvref_common.c"
     "${AOM_ROOT}/av1/common/mvref_common.h"
@@ -265,6 +265,8 @@ set(AOM_AV1_ENCODER_SOURCES
     "${AOM_ROOT}/av1/encoder/aq_cyclicrefresh.h"
     "${AOM_ROOT}/av1/encoder/aq_variance.c"
     "${AOM_ROOT}/av1/encoder/aq_variance.h"
+    "${AOM_ROOT}/av1/encoder/av1_quantize.c"
+    "${AOM_ROOT}/av1/encoder/av1_quantize.h"
     "${AOM_ROOT}/av1/encoder/bitstream.c"
     "${AOM_ROOT}/av1/encoder/bitstream.h"
     "${AOM_ROOT}/av1/encoder/block.h"
@@ -297,8 +299,6 @@ set(AOM_AV1_ENCODER_SOURCES
     "${AOM_ROOT}/av1/encoder/mcomp.h"
     "${AOM_ROOT}/av1/encoder/picklpf.c"
     "${AOM_ROOT}/av1/encoder/picklpf.h"
-    "${AOM_ROOT}/av1/encoder/quantize.c"
-    "${AOM_ROOT}/av1/encoder/quantize.h"
     "${AOM_ROOT}/av1/encoder/ratectrl.c"
     "${AOM_ROOT}/av1/encoder/ratectrl.h"
     "${AOM_ROOT}/av1/encoder/rd.c"
@@ -472,10 +472,10 @@ set(AOM_AV1_ENCODER_SSE2_INTRIN
     #"${AOM_ROOT}/av1/encoder/x86/wedge_utils_sse2.c"
     "${AOM_ROOT}/av1/encoder/x86/dct_intrin_sse2.c"
     "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_sse2.c"
-    "${AOM_ROOT}/av1/encoder/x86/quantize_sse2.c")
+    "${AOM_ROOT}/av1/encoder/x86/av1_quantize_sse2.c")
 
 set(AOM_AV1_ENCODER_SSSE3_ASM
-    "${AOM_ROOT}/av1/encoder/x86/quantize_ssse3_x86_64.asm")
+    "${AOM_ROOT}/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm")
 
 set(AOM_AV1_ENCODER_SSSE3_INTRIN
     # Requires CONFIG_CLPF
diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index 5b5f6c98a5ea4d431a3f1ddf83a6fb2469c3b07c..958dc45c5518c3cd26877280eadaab4640cb5b5e 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -12,6 +12,8 @@
 AV1_COMMON_SRCS-yes += av1_common.mk
 AV1_COMMON_SRCS-yes += av1_iface_common.h
 AV1_COMMON_SRCS-yes += common/alloccommon.c
+AV1_COMMON_SRCS-yes += common/av1_loopfilter.c
+AV1_COMMON_SRCS-yes += common/av1_loopfilter.h
 AV1_COMMON_SRCS-yes += common/blockd.c
 AV1_COMMON_SRCS-yes += common/debugmodes.c
 AV1_COMMON_SRCS-yes += common/entropy.c
@@ -30,7 +32,6 @@ AV1_COMMON_SRCS-yes += common/filter.h
 AV1_COMMON_SRCS-yes += common/filter.c
 AV1_COMMON_SRCS-yes += common/idct.h
 AV1_COMMON_SRCS-yes += common/idct.c
-AV1_COMMON_SRCS-yes += common/loopfilter.h
 AV1_COMMON_SRCS-yes += common/thread_common.h
 AV1_COMMON_SRCS-yes += common/mv.h
 AV1_COMMON_SRCS-yes += common/onyxc_int.h
@@ -47,7 +48,6 @@ AV1_COMMON_SRCS-yes += common/seg_common.h
 AV1_COMMON_SRCS-yes += common/seg_common.c
 AV1_COMMON_SRCS-yes += common/tile_common.h
 AV1_COMMON_SRCS-yes += common/tile_common.c
-AV1_COMMON_SRCS-yes += common/loopfilter.c
 AV1_COMMON_SRCS-yes += common/thread_common.c
 AV1_COMMON_SRCS-yes += common/mvref_common.c
 AV1_COMMON_SRCS-yes += common/mvref_common.h
@@ -125,15 +125,15 @@ AV1_COMMON_SRCS-yes += common/laplace_tables.c
 endif
 
 ifneq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
-AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans4_dspr2.c
-AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans8_dspr2.c
-AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans16_dspr2.c
+AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/av1_itrans4_dspr2.c
+AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/av1_itrans8_dspr2.c
+AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/av1_itrans16_dspr2.c
 endif
 
 # common (msa)
-AV1_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct4x4_msa.c
-AV1_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct8x8_msa.c
-AV1_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct16x16_msa.c
+AV1_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/av1_idct4x4_msa.c
+AV1_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/av1_idct8x8_msa.c
+AV1_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/av1_idct16x16_msa.c
 
 AV1_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_intrin_sse2.c
 AV1_COMMON_SRCS-$(HAVE_AVX2) += common/x86/hybrid_inv_txfm_avx2.c
diff --git a/av1/av1_cx.mk b/av1/av1_cx.mk
index 542e7d8436c745ca851b4be514949b5da004daf9..3e1fe8177522a8b3b83b94c05bae177c3ba015c4 100644
--- a/av1/av1_cx.mk
+++ b/av1/av1_cx.mk
@@ -18,6 +18,8 @@ AV1_CX_SRCS_REMOVE-no  += $(AV1_COMMON_SRCS_REMOVE-no)
 
 AV1_CX_SRCS-yes += av1_cx_iface.c
 
+AV1_CX_SRCS-yes += encoder/av1_quantize.c
+AV1_CX_SRCS-yes += encoder/av1_quantize.h
 AV1_CX_SRCS-yes += encoder/bitstream.c
 AV1_CX_SRCS-yes += encoder/context_tree.c
 AV1_CX_SRCS-yes += encoder/context_tree.h
@@ -58,7 +60,6 @@ AV1_CX_SRCS-yes += encoder/lookahead.c
 AV1_CX_SRCS-yes += encoder/lookahead.h
 AV1_CX_SRCS-yes += encoder/mcomp.h
 AV1_CX_SRCS-yes += encoder/encoder.h
-AV1_CX_SRCS-yes += encoder/quantize.h
 AV1_CX_SRCS-yes += encoder/ratectrl.h
 AV1_CX_SRCS-yes += encoder/rd.h
 AV1_CX_SRCS-yes += encoder/rdopt.h
@@ -74,7 +75,6 @@ AV1_CX_SRCS-yes += encoder/picklpf.c
 AV1_CX_SRCS-yes += encoder/picklpf.h
 AV1_CX_SRCS-$(CONFIG_LOOP_RESTORATION) += encoder/pickrst.c
 AV1_CX_SRCS-$(CONFIG_LOOP_RESTORATION) += encoder/pickrst.h
-AV1_CX_SRCS-yes += encoder/quantize.c
 AV1_CX_SRCS-yes += encoder/ratectrl.c
 AV1_CX_SRCS-yes += encoder/rd.c
 AV1_CX_SRCS-yes += encoder/rdopt.c
@@ -122,8 +122,8 @@ AV1_CX_SRCS-yes += encoder/generic_encoder.c
 AV1_CX_SRCS-yes += encoder/laplace_encoder.c
 endif
 
+AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/av1_quantize_sse2.c
 AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
-AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
 ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
 AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/highbd_block_error_intrin_sse2.c
 endif
@@ -132,15 +132,15 @@ AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm
 AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/error_sse2.asm
 
 ifeq ($(ARCH_X86_64),yes)
-AV1_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3_x86_64.asm
+AV1_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/av1_quantize_ssse3_x86_64.asm
 endif
 
 AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_intrin_sse2.c
 AV1_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3.c
 AV1_CX_SRCS-$(HAVE_AVX2) += encoder/x86/hybrid_fwd_txfm_avx2.c
 ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
-AV1_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/highbd_fwd_txfm_sse4.c
 AV1_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/av1_highbd_quantize_sse4.c
+AV1_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/highbd_fwd_txfm_sse4.c
 endif
 
 ifeq ($(CONFIG_EXT_INTER),yes)
diff --git a/av1/common/loopfilter.c b/av1/common/av1_loopfilter.c
similarity index 99%
rename from av1/common/loopfilter.c
rename to av1/common/av1_loopfilter.c
index 9f1fff5694947b32302d4a7d68bc2e059f94cc1f..e703ca0aa2b86d2c8d9fcbbb24ae9b5516aa13cd 100644
--- a/av1/common/loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -13,7 +13,7 @@
 
 #include "./aom_config.h"
 #include "./aom_dsp_rtcd.h"
-#include "av1/common/loopfilter.h"
+#include "av1/common/av1_loopfilter.h"
 #include "av1/common/onyxc_int.h"
 #include "av1/common/reconinter.h"
 #include "aom_dsp/aom_dsp_common.h"
diff --git a/av1/common/loopfilter.h b/av1/common/av1_loopfilter.h
similarity index 100%
rename from av1/common/loopfilter.h
rename to av1/common/av1_loopfilter.h
diff --git a/av1/common/mips/dspr2/itrans16_dspr2.c b/av1/common/mips/dspr2/av1_itrans16_dspr2.c
similarity index 100%
rename from av1/common/mips/dspr2/itrans16_dspr2.c
rename to av1/common/mips/dspr2/av1_itrans16_dspr2.c
diff --git a/av1/common/mips/dspr2/itrans4_dspr2.c b/av1/common/mips/dspr2/av1_itrans4_dspr2.c
similarity index 100%
rename from av1/common/mips/dspr2/itrans4_dspr2.c
rename to av1/common/mips/dspr2/av1_itrans4_dspr2.c
diff --git a/av1/common/mips/dspr2/itrans8_dspr2.c b/av1/common/mips/dspr2/av1_itrans8_dspr2.c
similarity index 100%
rename from av1/common/mips/dspr2/itrans8_dspr2.c
rename to av1/common/mips/dspr2/av1_itrans8_dspr2.c
diff --git a/av1/common/mips/msa/idct16x16_msa.c b/av1/common/mips/msa/av1_idct16x16_msa.c
similarity index 100%
rename from av1/common/mips/msa/idct16x16_msa.c
rename to av1/common/mips/msa/av1_idct16x16_msa.c
diff --git a/av1/common/mips/msa/idct4x4_msa.c b/av1/common/mips/msa/av1_idct4x4_msa.c
similarity index 100%
rename from av1/common/mips/msa/idct4x4_msa.c
rename to av1/common/mips/msa/av1_idct4x4_msa.c
diff --git a/av1/common/mips/msa/idct8x8_msa.c b/av1/common/mips/msa/av1_idct8x8_msa.c
similarity index 100%
rename from av1/common/mips/msa/idct8x8_msa.c
rename to av1/common/mips/msa/av1_idct8x8_msa.c
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index c1c2982889c7bc7bf7b8eedba403de884eab3343..023a7e31ac870bedc2ef254ece584069c9d56835 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -20,11 +20,11 @@
 #include "aom_dsp/ans.h"
 #endif
 #include "av1/common/alloccommon.h"
+#include "av1/common/av1_loopfilter.h"
 #include "av1/common/entropy.h"
 #include "av1/common/entropymode.h"
 #include "av1/common/entropymv.h"
 #include "av1/common/frame_buffers.h"
-#include "av1/common/loopfilter.h"
 #include "av1/common/mv.h"
 #include "av1/common/quant_common.h"
 #if CONFIG_LOOP_RESTORATION
diff --git a/av1/common/seg_common.c b/av1/common/seg_common.c
index b19ef24197c37e6edeefb80b4401301c57729d02..21a8536297467e534ef1e83beb880ccc1541c56b 100644
--- a/av1/common/seg_common.c
+++ b/av1/common/seg_common.c
@@ -11,8 +11,8 @@
 
 #include <assert.h>
 
+#include "av1/common/av1_loopfilter.h"
 #include "av1/common/blockd.h"
-#include "av1/common/loopfilter.h"
 #include "av1/common/seg_common.h"
 #include "av1/common/quant_common.h"
 
diff --git a/av1/common/thread_common.c b/av1/common/thread_common.c
index ef43e496a30d17c0665d55f0d78dd3e03aec8cbd..6090e55dd0a68dd1d3156bceabd6acba8d57a716 100644
--- a/av1/common/thread_common.c
+++ b/av1/common/thread_common.c
@@ -15,7 +15,6 @@
 #include "av1/common/entropymode.h"
 #include "av1/common/thread_common.h"
 #include "av1/common/reconinter.h"
-#include "av1/common/loopfilter.h"
 
 #if CONFIG_MULTITHREAD
 static INLINE void mutex_lock(pthread_mutex_t *const mutex) {
diff --git a/av1/common/thread_common.h b/av1/common/thread_common.h
index 300df7e666b6d5e549be12db5a2acc00e03e25ab..7b57ae8f34f3b50f942bd96f0112110eab7b5644 100644
--- a/av1/common/thread_common.h
+++ b/av1/common/thread_common.h
@@ -12,7 +12,7 @@
 #ifndef AV1_COMMON_LOOPFILTER_THREAD_H_
 #define AV1_COMMON_LOOPFILTER_THREAD_H_
 #include "./aom_config.h"
-#include "av1/common/loopfilter.h"
+#include "av1/common/av1_loopfilter.h"
 #include "aom_util/aom_thread.h"
 
 #ifdef __cplusplus
diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index e40ec39fa9102c210cbd73c901a888cbcc602f8c..a3550dc411af2d7d4c45180091de7284d735f69d 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -25,7 +25,7 @@
 #include "aom_util/aom_thread.h"
 
 #include "av1/common/alloccommon.h"
-#include "av1/common/loopfilter.h"
+#include "av1/common/av1_loopfilter.h"
 #include "av1/common/onyxc_int.h"
 #include "av1/common/quant_common.h"
 #include "av1/common/reconinter.h"
diff --git a/av1/encoder/arm/neon/quantize_neon.c b/av1/encoder/arm/neon/quantize_neon.c
index 565009494b15372e2ed16347f6a29f705c821afa..36e7d337023bb63c7f93b77c352f6d597a4f8ffa 100644
--- a/av1/encoder/arm/neon/quantize_neon.c
+++ b/av1/encoder/arm/neon/quantize_neon.c
@@ -18,8 +18,8 @@
 #include "av1/common/quant_common.h"
 #include "av1/common/seg_common.h"
 
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/encoder.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/rd.h"
 
 void av1_quantize_fp_neon(const int16_t *coeff_ptr, intptr_t count,
diff --git a/av1/encoder/quantize.c b/av1/encoder/av1_quantize.c
similarity index 99%
rename from av1/encoder/quantize.c
rename to av1/encoder/av1_quantize.c
index 96644d339a00886313ca02a5fc7db62effce845e..185460b0bd9883b72dac8146825d135e2a8d2f07 100644
--- a/av1/encoder/quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -20,8 +20,8 @@
 #include "av1/common/scan.h"
 #include "av1/common/seg_common.h"
 
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/encoder.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/rd.h"
 
 #if CONFIG_NEW_QUANT
diff --git a/av1/encoder/quantize.h b/av1/encoder/av1_quantize.h
similarity index 100%
rename from av1/encoder/quantize.h
rename to av1/encoder/av1_quantize.h
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 0934ff90fcaf683741241f1e5e59b190b046d53a..8e39d5768787911c2e72aba4199d9bca7e197836 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -23,9 +23,9 @@
 #include "av1/common/reconintra.h"
 #include "av1/common/scan.h"
 
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/encodemb.h"
 #include "av1/encoder/hybrid_fwd_txfm.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/rd.h"
 #include "av1/encoder/tokenize.h"
 
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 63b8497394be38f6d807b0c1df424632c63603ff..8968cfda11fae5d7b77182c0f12710b2425bf650 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -26,13 +26,13 @@
 #include "aom_dsp/ans.h"
 #include "aom_dsp/buf_ans.h"
 #endif
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/context_tree.h"
 #include "av1/encoder/encodemb.h"
 #include "av1/encoder/firstpass.h"
 #include "av1/encoder/lookahead.h"
 #include "av1/encoder/mbgraph.h"
 #include "av1/encoder/mcomp.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/rd.h"
 #include "av1/encoder/speed_features.h"
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 8b8079779d302b54cca5622a526bc605669cb644..683bde6ec7eac01c59a35da9a559179aba1ede5f 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -27,6 +27,7 @@
 #include "av1/common/entropymv.h"
 #include "av1/common/quant_common.h"
 #include "av1/common/reconinter.h"  // av1_setup_dst_planes()
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/aq_variance.h"
 #include "av1/encoder/block.h"
 #include "av1/encoder/encodeframe.h"
@@ -36,7 +37,6 @@
 #include "av1/encoder/extend.h"
 #include "av1/encoder/firstpass.h"
 #include "av1/encoder/mcomp.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/rd.h"
 
 #define OUTPUT_FPF 0
diff --git a/av1/encoder/picklpf.c b/av1/encoder/picklpf.c
index 56ee0742880c9615a4a5387dac36536588978876..199c20ecb65d7024982420984f20f005ae750ad3 100644
--- a/av1/encoder/picklpf.c
+++ b/av1/encoder/picklpf.c
@@ -19,13 +19,13 @@
 #include "aom_mem/aom_mem.h"
 #include "aom_ports/mem.h"
 
-#include "av1/common/loopfilter.h"
+#include "av1/common/av1_loopfilter.h"
 #include "av1/common/onyxc_int.h"
 #include "av1/common/quant_common.h"
 
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/encoder.h"
 #include "av1/encoder/picklpf.h"
-#include "av1/encoder/quantize.h"
 
 int av1_get_max_filter_level(const AV1_COMP *cpi) {
   if (cpi->oxcf.pass == 2) {
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index f04832c66f1b3800bc71e792387c24924c785787..ab24c908987c82e941f1d079f04242402dd8cf3c 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -25,10 +25,10 @@
 #include "av1/common/quant_common.h"
 #include "av1/common/restoration.h"
 
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/encoder.h"
 #include "av1/encoder/picklpf.h"
 #include "av1/encoder/pickrst.h"
-#include "av1/encoder/quantize.h"
 
 typedef double (*search_restore_type)(const YV12_BUFFER_CONFIG *src,
                                       AV1_COMP *cpi, int filter_level,
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 724912a31ed3f2c56cb6e828cf7c1ae16b8af652..c4568a4ad462a2989dcc3087c05fa15a018ff8fc 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -31,12 +31,12 @@
 #include "av1/common/reconintra.h"
 #include "av1/common/seg_common.h"
 
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/cost.h"
 #include "av1/encoder/encodemb.h"
 #include "av1/encoder/encodemv.h"
 #include "av1/encoder/encoder.h"
 #include "av1/encoder/mcomp.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/rd.h"
 #include "av1/encoder/tokenize.h"
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index df26b601878108b42e0b69665f9524ba3caf3c61..e87e535e73c4a5d2cc03d3d68152cd2513638f77 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -38,6 +38,7 @@
 #endif  // CONFIG_WARPED_MOTION
 
 #include "av1/encoder/aq_variance.h"
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/cost.h"
 #include "av1/encoder/encodemb.h"
 #include "av1/encoder/encodemv.h"
@@ -47,7 +48,6 @@
 #if CONFIG_PALETTE
 #include "av1/encoder/palette.h"
 #endif  // CONFIG_PALETTE
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/rd.h"
 #include "av1/encoder/rdopt.h"
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 1e4c7155677607cf7881973aa762e4fd426ed7c6..53bf22b40e799101a236512afef49ec456fd5f8b 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -17,11 +17,11 @@
 #include "av1/common/quant_common.h"
 #include "av1/common/reconinter.h"
 #include "av1/common/odintrin.h"
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/extend.h"
 #include "av1/encoder/firstpass.h"
 #include "av1/encoder/mcomp.h"
 #include "av1/encoder/encoder.h"
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/segmentation.h"
 #include "av1/encoder/temporal_filter.h"
diff --git a/av1/encoder/x86/quantize_sse2.c b/av1/encoder/x86/av1_quantize_sse2.c
similarity index 100%
rename from av1/encoder/x86/quantize_sse2.c
rename to av1/encoder/x86/av1_quantize_sse2.c
diff --git a/av1/encoder/x86/quantize_ssse3_x86_64.asm b/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
similarity index 100%
rename from av1/encoder/x86/quantize_ssse3_x86_64.asm
rename to av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
diff --git a/av1/encoder/x86/ssim_opt_x86_64.asm b/av1/encoder/x86/av1_ssim_opt_x86_64.asm
similarity index 100%
rename from av1/encoder/x86/ssim_opt_x86_64.asm
rename to av1/encoder/x86/av1_ssim_opt_x86_64.asm
diff --git a/test/lpf_8_test.cc b/test/lpf_8_test.cc
index 318df192fce8cd66e3598a8afb1ff681e6a96671..dfaaed598037391ba80ae9dc9c10dbda64cc499c 100644
--- a/test/lpf_8_test.cc
+++ b/test/lpf_8_test.cc
@@ -21,8 +21,8 @@
 #include "test/clear_system_state.h"
 #include "test/register_state_check.h"
 #include "test/util.h"
+#include "av1/common/av1_loopfilter.h"
 #include "av1/common/entropy.h"
-#include "av1/common/loopfilter.h"
 #include "aom/aom_integer.h"
 
 using libaom_test::ACMRandom;