diff --git a/libweave/src/base_api_handler_unittest.cc b/libweave/src/base_api_handler_unittest.cc
index c7456cf..8bc174a 100644
--- a/libweave/src/base_api_handler_unittest.cc
+++ b/libweave/src/base_api_handler_unittest.cc
@@ -17,7 +17,7 @@
 #include "libweave/src/states/state_manager.h"
 #include "libweave/src/storage_impls.h"
 
-namespace buffet {
+namespace weave {
 
 class BaseApiHandlerTest : public ::testing::Test {
  protected:
@@ -65,7 +65,7 @@
   }
 
   void AddCommand(const std::string& command) {
-    auto command_instance = buffet::CommandInstance::FromJson(
+    auto command_instance = CommandInstance::FromJson(
         unittests::CreateDictionaryValue(command.c_str()).get(),
         commands::attributes::kCommand_Visibility_Local,
         command_manager_->GetCommandDictionary(), nullptr, nullptr);
@@ -192,4 +192,4 @@
   EXPECT_EQ("newLocation", config.location());
 }
 
-}  // namespace buffet
+}  // namespace weave