diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index 76d8826..1c86a88 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -31,10 +31,9 @@
 static const int delta_lf_id_lut[MAX_MB_PLANE][2] = { { 0, 1 },
                                                       { 2, 2 },
                                                       { 3, 3 } };
-
 static const int mode_lf_lut[] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // INTRA_MODES
-  1, 1, 0, 1,                             // INTER_MODES (GLOBALMV == 0)
+  1, 1, 0, 1,                             // INTER_SINGLE_MODES (GLOBALMV == 0)
   1, 1, 1, 1, 1, 1, 0, 1  // INTER_COMPOUND_MODES (GLOBAL_GLOBALMV == 0)
 };
 
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 6384e39..8ca83ff 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -451,7 +451,7 @@
 };
 
 static const aom_cdf_prob
-    default_inter_compound_mode_cdf[INTER_MODE_CONTEXTS][CDF_SIZE(
+    default_inter_compound_mode_cdf[INTER_COMPOUND_MODE_CONTEXTS][CDF_SIZE(
         INTER_COMPOUND_MODES)] = {
       { AOM_CDF8(7760, 13823, 15808, 17641, 19156, 20666, 26891) },
       { AOM_CDF8(10730, 19452, 21145, 22749, 24039, 25131, 28724) },
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 59f249b..5c7abef 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -89,7 +89,7 @@
   aom_cdf_prob refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(2)];
   aom_cdf_prob drl_cdf[DRL_MODE_CONTEXTS][CDF_SIZE(2)];
 
-  aom_cdf_prob inter_compound_mode_cdf[INTER_MODE_CONTEXTS]
+  aom_cdf_prob inter_compound_mode_cdf[INTER_COMPOUND_MODE_CONTEXTS]
                                       [CDF_SIZE(INTER_COMPOUND_MODES)];
   aom_cdf_prob compound_type_cdf[BLOCK_SIZES_ALL]
                                 [CDF_SIZE(MASKED_COMPOUND_TYPES)];
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 7b6bb76..38616b9 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -520,8 +520,7 @@
 #define MAX_ANGLE_DELTA 3
 #define ANGLE_STEP 3
 
-#define INTER_MODES (1 + NEWMV - NEARESTMV)
-
+#define INTER_SINGLE_MODES (1 + NEWMV - NEARESTMV)
 #define INTER_COMPOUND_MODES (1 + NEW_NEWMV - NEAREST_NEARESTMV)
 
 #define SKIP_CONTEXTS 3
@@ -545,7 +544,7 @@
 #define REFMV_CTX_MASK ((1 << (8 - REFMV_OFFSET)) - 1)
 
 #define COMP_NEWMV_CTXS 5
-#define INTER_MODE_CONTEXTS 8
+#define INTER_COMPOUND_MODE_CONTEXTS 8
 
 #define DELTA_Q_SMALL 3
 #define DELTA_Q_PROBS (DELTA_Q_SMALL)
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index d5711e4..1c3faf2 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -669,7 +669,8 @@
   //! intra_inter_cost
   int intra_inter_cost[INTRA_INTER_CONTEXTS][2];
   //! inter_compound_mode_cost
-  int inter_compound_mode_cost[INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES];
+  int inter_compound_mode_cost[INTER_COMPOUND_MODE_CONTEXTS]
+                              [INTER_COMPOUND_MODES];
   //! compound_type_cost
   int compound_type_cost[BLOCK_SIZES_ALL][MASKED_COMPOUND_TYPES];
   //! wedge_idx_cost
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 0e29786..386b60d 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -1122,7 +1122,8 @@
   unsigned int zeromv_mode[GLOBALMV_MODE_CONTEXTS][2];
   unsigned int refmv_mode[REFMV_MODE_CONTEXTS][2];
   unsigned int drl_mode[DRL_MODE_CONTEXTS][2];
-  unsigned int inter_compound_mode[INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES];
+  unsigned int inter_compound_mode[INTER_COMPOUND_MODE_CONTEXTS]
+                                  [INTER_COMPOUND_MODES];
   unsigned int wedge_idx[BLOCK_SIZES_ALL][16];
   unsigned int interintra[BLOCK_SIZE_GROUPS][2];
   unsigned int interintra_mode[BLOCK_SIZE_GROUPS][INTERINTRA_MODES];
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 6e5f347..b7b98a9 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -274,7 +274,7 @@
       av1_cost_tokens_from_cdf(mode_costs->drl_mode_cost0[i], fc->drl_cdf[i],
                                NULL);
     }
-    for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
+    for (i = 0; i < INTER_COMPOUND_MODE_CONTEXTS; ++i)
       av1_cost_tokens_from_cdf(mode_costs->inter_compound_mode_cost[i],
                                fc->inter_compound_mode_cdf[i], NULL);
     for (i = 0; i < BLOCK_SIZES_ALL; ++i)
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index fa7bf7e..cad59e5 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -403,12 +403,13 @@
 
   /* ext_inter experiment */
   /* New compound mode */
-  cts_each_dim[0] = INTER_MODE_CONTEXTS;
+  cts_each_dim[0] = INTER_COMPOUND_MODE_CONTEXTS;
   cts_each_dim[1] = INTER_COMPOUND_MODES;
   optimize_cdf_table(&fc.inter_compound_mode[0][0], probsfile, 2, cts_each_dim,
                      "static const aom_cdf_prob\n"
-                     "default_inter_compound_mode_cdf[INTER_MODE_CONTEXTS][CDF_"
-                     "SIZE(INTER_COMPOUND_MODES)]");
+                     "default_inter_compound_mode_cdf"
+                     "[INTER_COMPOUND_MODE_CONTEXTS][CDF_SIZE("
+                     "INTER_COMPOUND_MODES)]");
 
   /* Interintra */
   cts_each_dim[0] = BLOCK_SIZE_GROUPS;