diff --git a/av1/encoder/av1_quantize.c b/av1/encoder/av1_quantize.c
index f4bdde9..6cffac2 100644
--- a/av1/encoder/av1_quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -206,7 +206,7 @@
     const int rc = 0;
     if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift, dequant,
                                  cuml_bins_ptr, dequant_val, qcoeff_ptr,
-                                 dqcoeff_ptr, get_tx_scale(TX_32X32)))
+                                 dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -226,7 +226,7 @@
     const int rc = 0;
     if (quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant,
                                     cuml_bins_ptr, dequant_val, qcoeff_ptr,
-                                    dqcoeff_ptr, get_tx_scale(TX_32X32)))
+                                    dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -247,7 +247,7 @@
     const int rc = 0;
     if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift, dequant,
                                  cuml_bins_ptr, dequant_val, qcoeff_ptr,
-                                 dqcoeff_ptr, get_tx_scale(TX_64X64)))
+                                 dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -267,7 +267,7 @@
     const int rc = 0;
     if (quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant,
                                     cuml_bins_ptr, dequant_val, qcoeff_ptr,
-                                    dqcoeff_ptr, get_tx_scale(TX_64X64)))
+                                    dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -340,11 +340,11 @@
     int i;
     for (i = 0; i < n_coeffs; i++) {
       const int rc = scan[i];
-      if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant_ptr[rc != 0],
-                                   quant_shift_ptr[rc != 0],
-                                   dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
-                                   dequant_val[band[i]], &qcoeff_ptr[rc],
-                                   &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
+      if (quantize_coeff_bigtx_nuq(
+              coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
+              dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
+              dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
+              av1_get_tx_scale(TX_32X32)))
         eob = i;
     }
   }
@@ -369,7 +369,7 @@
       if (quantize_coeff_bigtx_fp_nuq(
               coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
               cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
-              &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
+              &dqcoeff_ptr[rc], av1_get_tx_scale(TX_32X32)))
         eob = i;
     }
   }
@@ -393,11 +393,11 @@
     int i;
     for (i = 0; i < n_coeffs; i++) {
       const int rc = scan[i];
-      if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant_ptr[rc != 0],
-                                   quant_shift_ptr[rc != 0],
-                                   dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
-                                   dequant_val[band[i]], &qcoeff_ptr[rc],
-                                   &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
+      if (quantize_coeff_bigtx_nuq(
+              coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
+              dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
+              dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
+              av1_get_tx_scale(TX_64X64)))
         eob = i;
     }
   }
@@ -422,7 +422,7 @@
       if (quantize_coeff_bigtx_fp_nuq(
               coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
               cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
-              &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
+              &dqcoeff_ptr[rc], av1_get_tx_scale(TX_64X64)))
         eob = i;
     }
   }
@@ -1206,7 +1206,7 @@
               coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
               dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
               dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
-              get_tx_scale(TX_32X32)))
+              av1_get_tx_scale(TX_32X32)))
         eob = i;
     }
   }
@@ -1232,7 +1232,7 @@
       if (highbd_quantize_coeff_bigtx_fp_nuq(
               coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
               cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
-              &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
+              &dqcoeff_ptr[rc], av1_get_tx_scale(TX_32X32)))
         eob = i;
     }
   }
@@ -1260,7 +1260,7 @@
               coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
               dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
               dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
-              get_tx_scale(TX_64X64)))
+              av1_get_tx_scale(TX_64X64)))
         eob = i;
     }
   }
@@ -1286,7 +1286,7 @@
       if (highbd_quantize_coeff_bigtx_fp_nuq(
               coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
               cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
-              &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
+              &dqcoeff_ptr[rc], av1_get_tx_scale(TX_64X64)))
         eob = i;
     }
   }
@@ -1331,7 +1331,7 @@
     const int rc = 0;
     if (highbd_quantize_coeff_bigtx_nuq(
             coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr,
-            dequant_val, qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_32X32)))
+            dequant_val, qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -1349,7 +1349,7 @@
     const int rc = 0;
     if (highbd_quantize_coeff_bigtx_fp_nuq(
             coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val,
-            qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_32X32)))
+            qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -1368,7 +1368,7 @@
     const int rc = 0;
     if (highbd_quantize_coeff_bigtx_nuq(
             coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr,
-            dequant_val, qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_64X64)))
+            dequant_val, qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
@@ -1386,7 +1386,7 @@
     const int rc = 0;
     if (highbd_quantize_coeff_bigtx_fp_nuq(
             coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val,
-            qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_64X64)))
+            qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
       eob = 0;
   }
   *eob_ptr = eob + 1;
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index dbb7525..c450244 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -168,7 +168,7 @@
   const int16_t *const scan = scan_order->scan;
   const int16_t *const nb = scan_order->neighbors;
   int dqv;
-  const int shift = get_tx_scale(tx_size);
+  const int shift = av1_get_tx_scale(tx_size);
 #if CONFIG_AOM_QM
   int seg_id = xd->mi[0]->mbmi.segment_id;
   const qm_val_t *iqmatrix = pd->seg_iqmatrix[seg_id][!ref][tx_size];
@@ -528,7 +528,7 @@
   const int16_t *const scan = scan_order->scan;
   const int16_t *const nb = scan_order->neighbors;
   int dqv;
-  const int shift = get_tx_scale(tx_size);
+  const int shift = av1_get_tx_scale(tx_size);
 #if CONFIG_AOM_QM
   int seg_id = xd->mi[0]->mbmi.segment_id;
   const qm_val_t *iqmatrix = pd->seg_iqmatrix[seg_id][!ref][tx_size];
@@ -959,7 +959,7 @@
 
   src_diff =
       &p->src_diff[(blk_row * diff_stride + blk_col) << tx_size_wide_log2[0]];
-  qparam.log_scale = get_tx_scale(tx_size);
+  qparam.log_scale = av1_get_tx_scale(tx_size);
 #if CONFIG_NEW_QUANT
   qparam.tx_size = tx_size;
   qparam.dq = get_dq_profile_from_ctx(x->qindex, ctx, is_inter, plane_type);
@@ -1527,7 +1527,7 @@
   const int tx_blk_size = tx_size_wide[tx_size];
   daala_enc_ctx *daala_enc = &x->daala_enc;
   PVQ_SKIP_TYPE ac_dc_coded;
-  int coeff_shift = 3 - get_tx_scale(tx_size);
+  int coeff_shift = 3 - av1_get_tx_scale(tx_size);
   int hbd_downshift = 0;
   int rounding_mask;
   int pvq_dc_quant;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 58dacde..f02cf50 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1348,7 +1348,7 @@
     // not involve an inverse transform, but it is less accurate.
     const int buffer_length = tx_size_2d[tx_size];
     int64_t this_sse;
-    int shift = (MAX_TX_SCALE - get_tx_scale(tx_size)) * 2;
+    int shift = (MAX_TX_SCALE - av1_get_tx_scale(tx_size)) * 2;
     tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
     tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
 #if CONFIG_PVQ