diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 575033c2d2b3dc5e1a1fba80edd5d7db13a9458d..aa09a1e3ef7133043601e81246293983e4c1fdf3 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -2599,7 +2599,7 @@ static void scale_and_extend_source(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
         Scale2Ratio(cm->horiz_scale, &hr, &hs);
         Scale2Ratio(cm->vert_scale, &vr, &vs);
 
-        vp8_scale_frame(sd, &cpi->scaled_source, cm->temp_scale_frame.y_buffer,
+        vpx_scale_frame(sd, &cpi->scaled_source, cm->temp_scale_frame.y_buffer,
                         tmp_height, hs, hr, vs, vr, 0);
 
         vp8_yv12_extend_frame_borders(&cpi->scaled_source);
diff --git a/vpx_scale/generic/vpx_scale.c b/vpx_scale/generic/vpx_scale.c
index c83c3b68fdc43c73a64df9cd7b0b76cf92037882..8044d2ad776f4149e08fb6ee6713454fad8a5c51 100644
--- a/vpx_scale/generic/vpx_scale.c
+++ b/vpx_scale/generic/vpx_scale.c
@@ -453,7 +453,7 @@ void Scale2D
 
 /****************************************************************************
  *
- *  ROUTINE       :
+ *  ROUTINE       : vpx_scale_frame
  *
  *  INPUTS        : YV12_BUFFER_CONFIG *src       : Pointer to frame to be scaled.
  *                  YV12_BUFFER_CONFIG *dst       : Pointer to buffer to hold scaled frame.
@@ -475,7 +475,7 @@ void Scale2D
  *                  caching.
  *
  ****************************************************************************/
-void vp8_scale_frame
+void vpx_scale_frame
 (
   YV12_BUFFER_CONFIG *src,
   YV12_BUFFER_CONFIG *dst,
diff --git a/vpx_scale/vpx_scale.h b/vpx_scale/vpx_scale.h
index 308b6aab6854581d30910ad5c907ef74aca2ffc2..9ddf62efd4cb81cb23c432a82e3b5b96455f3f3e 100644
--- a/vpx_scale/vpx_scale.h
+++ b/vpx_scale/vpx_scale.h
@@ -14,7 +14,7 @@
 
 #include "vpx_scale/yv12config.h"
 
-extern void vp8_scale_frame(YV12_BUFFER_CONFIG *src,
+extern void vpx_scale_frame(YV12_BUFFER_CONFIG *src,
                             YV12_BUFFER_CONFIG *dst,
                             unsigned char *temp_area,
                             unsigned char temp_height,