diff --git a/av1/common/generic_code.c b/av1/common/generic_code.c
index c75c3da..e21e81c 100644
--- a/av1/common/generic_code.c
+++ b/av1/common/generic_code.c
@@ -28,7 +28,7 @@
 }
 
 /** Adapts a Q15 cdf after encoding/decoding a symbol. */
-void od_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate) {
+void aom_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate) {
   int i;
   *count = OD_MINI(*count + 1, 1 << rate);
   OD_ASSERT(cdf[n - 1] == 32768);
diff --git a/av1/common/generic_code.h b/av1/common/generic_code.h
index bd06786..0253530 100644
--- a/av1/common/generic_code.h
+++ b/av1/common/generic_code.h
@@ -54,7 +54,7 @@
 
 void aom_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first);
 
-void od_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate);
+void aom_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate);
 
 void od_encode_cdf_adapt_q15(od_ec_enc *ec, int val, uint16_t *cdf, int n,
  int *count, int rate);
diff --git a/av1/decoder/generic_decoder.c b/av1/decoder/generic_decoder.c
index 86187fa..0dd4de0 100644
--- a/av1/decoder/generic_decoder.c
+++ b/av1/decoder/generic_decoder.c
@@ -44,7 +44,7 @@
     }
   }
   val = od_ec_decode_cdf_q15(ec, cdf, n);
-  od_cdf_adapt_q15(val, cdf, n, count, rate);
+  aom_cdf_adapt_q15(val, cdf, n, count, rate);
   return val;
 }
 
diff --git a/av1/encoder/generic_encoder.c b/av1/encoder/generic_encoder.c
index 466ede3..2e7801f 100644
--- a/av1/encoder/generic_encoder.c
+++ b/av1/encoder/generic_encoder.c
@@ -47,7 +47,7 @@
     }
   }
   od_ec_encode_cdf_q15(ec, val, cdf, n);
-  od_cdf_adapt_q15(val, cdf, n, count, rate);
+  aom_cdf_adapt_q15(val, cdf, n, count, rate);
 }
 
 /** Encodes a value from 0 to N-1 (with N up to 16) based on a cdf and adapts