diff --git a/vp9/encoder/x86/vp9_dct32x32_sse2.c b/vp9/encoder/x86/vp9_dct32x32_sse2.c
index 6ef7f556f8d09d0501219eda67943a6112fd0f36..e20f03d94d4b852911cb455f509aa9f8fa71b678 100644
--- a/vp9/encoder/x86/vp9_dct32x32_sse2.c
+++ b/vp9/encoder/x86/vp9_dct32x32_sse2.c
@@ -12,8 +12,8 @@
 #include "vp9/common/vp9_idct.h"  // for cospi constants
 #include "vpx_ports/mem.h"
 
-void FDCT32x32_NAME(int16_t *input,
-                    int16_t *output_org, int pitch) {
+void FDCT32x32_2D(int16_t *input,
+                  int16_t *output_org, int pitch) {
   // Calculate pre-multiplied strides
   const int str1 = pitch >> 1;
   const int str2 = pitch;
diff --git a/vp9/encoder/x86/vp9_dct_sse2.c b/vp9/encoder/x86/vp9_dct_sse2.c
index c4e2732b00af8be123497bef7bd1a2f9774a5d4c..a476bb02244967b6dc9bded89d03fbfc1198d760 100644
--- a/vp9/encoder/x86/vp9_dct_sse2.c
+++ b/vp9/encoder/x86/vp9_dct_sse2.c
@@ -2572,10 +2572,14 @@ void vp9_short_fht16x16_sse2(int16_t *input, int16_t *output,
   write_buffer_16x16(output, in0, in1, 16);
 }
 
-#define FDCT32x32_NAME vp9_short_fdct32x32_rd_sse2
+#define FDCT32x32_2D vp9_short_fdct32x32_rd_sse2
 #define FDCT32x32_LOW_PRECISION 1
 #include "vp9/encoder/x86/vp9_dct32x32_sse2.c"
-
-// #define FDCT32x32_NAME vp9_short_fdct32x32_sse2
-// #define FDCT32x32_LOW_PRECISION 0
-// #include "vp9/encoder/x86/vp9_dct32x32_sse2.c"
+#undef  FDCT32x32_2D
+#undef  FDCT32x32_LOW_PRECISION
+
+#define FDCT32x32_2D vp9_short_fdct32x32_sse2
+#define FDCT32x32_LOW_PRECISION 0
+#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" // NOLINT
+#undef  FDCT32x32_2D
+#undef  FDCT32x32_LOW_PRECISION