diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index 38fb6fd9511eb0cb6ee589842f75859e38fc1be3..43b76ad628da597a761ef5e0b44d9e91869409df 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -78,8 +78,8 @@ ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
 AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_sse4.c
 AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_filters_sse4.h
 endif
-AV1_COMMON_SRCS-yes += common/av1_convolve.c
-AV1_COMMON_SRCS-yes += common/av1_convolve.h
+AV1_COMMON_SRCS-yes += common/convolve.c
+AV1_COMMON_SRCS-yes += common/convolve.h
 AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.h
 AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.c
 ifeq (yes,$(filter $(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION),yes))
diff --git a/av1/common/av1_convolve.c b/av1/common/convolve.c
similarity index 99%
rename from av1/common/av1_convolve.c
rename to av1/common/convolve.c
index 270ab706f6d9a7bf08a4f785c1b58e27ff11eada..eef629e16115ed9eb8299a76306959ad7998129e 100644
--- a/av1/common/av1_convolve.c
+++ b/av1/common/convolve.c
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "./av1_rtcd.h"
-#include "av1/common/av1_convolve.h"
+#include "av1/common/convolve.h"
 #include "av1/common/filter.h"
 #include "aom_dsp/aom_dsp_common.h"
 #include "aom_ports/mem.h"
diff --git a/av1/common/av1_convolve.h b/av1/common/convolve.h
similarity index 100%
rename from av1/common/av1_convolve.h
rename to av1/common/convolve.h
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index d3863ee8eaeeb6ae708c5c6a96bcc59143b27aa1..13f581e185a5672ed188bfe7d1afe82dff080f19 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -14,7 +14,7 @@
 
 #include "av1/common/filter.h"
 #include "av1/common/onyxc_int.h"
-#include "av1/common/av1_convolve.h"
+#include "av1/common/convolve.h"
 #include "aom/aom_integer.h"
 
 #ifdef __cplusplus
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index 435e106f40634cce3b11d17de997b9103d874186..0324b8e9ce33665142096b3c545a785c056680f1 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -15,7 +15,7 @@
 #include "./aom_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "av1/common/filter.h"
-#include "av1/common/av1_convolve.h"
+#include "av1/common/convolve.h"
 #include "aom_dsp/aom_dsp_common.h"
 #include "aom_ports/mem.h"