diff --git a/libweave/src/config.cc b/libweave/src/config.cc
index 5370ec0..f601b82 100644
--- a/libweave/src/config.cc
+++ b/libweave/src/config.cc
@@ -47,8 +47,8 @@
   return StringToEnum(role, &scope);
 }
 
-Settings CreateDefaultSettings() {
-  Settings result;
+Config::Settings CreateDefaultSettings() {
+  Config::Settings result;
   result.oauth_url = "https://accounts.google.com/o/oauth2/";
   result.service_url = "https://www.googleapis.com/clouddevices/v1/";
   result.local_anonymous_access_role = "viewer";
@@ -78,7 +78,7 @@
   callback.Run(settings_);
 }
 
-const Settings& Config::GetSettings() const {
+const Config::Settings& Config::GetSettings() const {
   return settings_;
 }