diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index e6ef853..04ae46f 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -13,9 +13,9 @@
 #include <cstring>
 #include "third_party/googletest/src/include/gtest/gtest.h"
 #include "./vpx_config.h"
-#include "vpx/vpx_decoder.h"
+#include "aom/vpx_decoder.h"
 
-namespace libvpx_test {
+namespace libaom_test {
 
 class CodecFactory;
 class CompressedVideoSource;
@@ -85,7 +85,7 @@
     return detail ? detail : vpx_codec_error(&decoder_);
   }
 
-  // Passes the external frame buffer information to libvpx.
+  // Passes the external frame buffer information to libaom.
   vpx_codec_err_t SetFrameBufferFunctions(
       vpx_get_frame_buffer_cb_fn_t cb_get,
       vpx_release_frame_buffer_cb_fn_t cb_release, void *user_priv) {
@@ -166,6 +166,6 @@
   vpx_codec_flags_t flags_;
 };
 
-}  // namespace libvpx_test
+}  // namespace libaom_test
 
 #endif  // TEST_DECODE_TEST_DRIVER_H_