diff --git a/vp9/common/x86/vp9_vp8_asm_stubs.c b/vp9/common/x86/vp9_asm_stubs.c
similarity index 100%
rename from vp9/common/x86/vp9_vp8_asm_stubs.c
rename to vp9/common/x86/vp9_asm_stubs.c
diff --git a/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm b/vp9/encoder/arm/armv5te/vp9_packtokens_armv5.asm
similarity index 100%
rename from vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm
rename to vp9/encoder/arm/armv5te/vp9_packtokens_armv5.asm
diff --git a/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm b/vp9/encoder/arm/armv5te/vp9_packtokens_mbrow_armv5.asm
similarity index 100%
rename from vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm
rename to vp9/encoder/arm/armv5te/vp9_packtokens_mbrow_armv5.asm
diff --git a/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm b/vp9/encoder/arm/armv5te/vp9_packtokens_partitions_armv5.asm
similarity index 100%
rename from vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm
rename to vp9/encoder/arm/armv5te/vp9_packtokens_partitions_armv5.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm b/vp9/encoder/arm/armv6/vp9_fast_quantize_b_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_fast_quantize_b_armv6.asm
index bca74391a2d3eeef61c74efc520dd8ec97cb5069..4f75ef5e7c0b340f067d2687f5f06cb3d234335b 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_fast_quantize_b_armv6.asm
@@ -221,4 +221,3 @@ loop_count
DCD 0x1000000
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_mse16x16_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_mse16x16_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_sad16x16_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_sad16x16_armv6.asm
index 1b4f5cf3b0f51a26e8ef5dbb02e809c8764b766b..4dcceb2bf86a3de347deb1960c966b7e261ae83d 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_sad16x16_armv6.asm
@@ -93,4 +93,3 @@ loop
ENDP
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm b/vp9/encoder/arm/armv6/vp9_short_fdct4x4_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_short_fdct4x4_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm b/vp9/encoder/arm/armv6/vp9_subtract_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_subtract_armv6.asm
index bb466c4e97968ed20a0e785870c49f824ead79b7..e53c1ed5b6df7df06ee7639b3ad24335e30ad78d 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_subtract_armv6.asm
@@ -262,4 +262,3 @@ loop
ENDP
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance16x16_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance16x16_armv6.asm
index 110db30746355c8152ded64b33472f1d2268903a..aa4727e662f2609efdcd25c8099e6d9898a9605b 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_variance16x16_armv6.asm
@@ -151,4 +151,3 @@ loop
ENDP
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance8x8_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance8x8_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_h_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_h_armv6.asm
index 7a8cafd3b0242c79a5d26e8426a8157ef5027dbb..e25436c22eb15a4239104d20d6605b45998f82cf 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_h_armv6.asm
@@ -179,4 +179,3 @@ c80808080
DCD 0x80808080
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_hv_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_hv_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_v_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_v_armv6.asm
index 0471d3d67c761cb05f41e06011d02ec5826242a2..c1ac5a1cba465f059454ce8a601453f6b15f1009 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_v_armv6.asm
@@ -181,4 +181,3 @@ c80808080
DCD 0x80808080
END
-
diff --git a/vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm b/vp9/encoder/arm/neon/vp9_memcpy_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm
rename to vp9/encoder/arm/neon/vp9_memcpy_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm b/vp9/encoder/arm/neon/vp9_mse16x16_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm
rename to vp9/encoder/arm/neon/vp9_mse16x16_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm b/vp9/encoder/arm/neon/vp9_shortwalsh4x4_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm
rename to vp9/encoder/arm/neon/vp9_shortwalsh4x4_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm b/vp9/encoder/arm/neon/vp9_subpixelvariance16x16_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm
rename to vp9/encoder/arm/neon/vp9_subpixelvariance16x16_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm b/vp9/encoder/arm/neon/vp9_subpixelvariance16x16s_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm
rename to vp9/encoder/arm/neon/vp9_subpixelvariance16x16s_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm b/vp9/encoder/arm/neon/vp9_subpixelvariance8x8_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm
rename to vp9/encoder/arm/neon/vp9_subpixelvariance8x8_neon.asm
diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk
index 3e2a2bdc9b6092f1db850d9d906db0eb4222f8c4..28cbcfd152696ef703f6ae7160a4eff546d3f625 100644
--- a/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@ -83,7 +83,7 @@ VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_idct_x86.h
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_subpixel_x86.h
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.h
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_postproc_x86.h
-VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_vp8_asm_stubs.c
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_asm_stubs.c
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.c
VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.h
VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.c