diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index a54886c..30cbb93 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -43,7 +43,7 @@
 const char kRobotAccount[]  = "robot_account";
 // Transient keys
 const char kDeviceKind[]    = "device_kind";
-const char kSystemName[]    = "system_name";
+const char kName[]          = "name";
 const char kDisplayName[]   = "display_name";
 
 }  // namespace storage_keys
@@ -325,7 +325,7 @@
   if (!device_id_.empty())
     resource->SetString("id", device_id_);
   resource->SetString("deviceKind", device_kind_);
-  resource->SetString("systemName", system_name_);
+  resource->SetString("name", name_);
   if (!display_name_.empty())
     resource->SetString("displayName", display_name_);
   resource->SetString("channel.supportedType", "xmpp");
@@ -377,7 +377,7 @@
   GetParamValue(params, storage_keys::kClientSecret, &client_secret_);
   GetParamValue(params, storage_keys::kApiKey, &api_key_);
   GetParamValue(params, storage_keys::kDeviceKind, &device_kind_);
-  GetParamValue(params, storage_keys::kSystemName, &system_name_);
+  GetParamValue(params, storage_keys::kName, &name_);
   GetParamValue(params, storage_keys::kDisplayName, &display_name_);
   GetParamValue(params, storage_keys::kOAuthURL, &oauth_url_);
   GetParamValue(params, storage_keys::kServiceURL, &service_url_);
diff --git a/buffet/device_registration_info.h b/buffet/device_registration_info.h
index 071df46..2ed39ed 100644
--- a/buffet/device_registration_info.h
+++ b/buffet/device_registration_info.h
@@ -159,7 +159,7 @@
   base::Time access_token_expiration_;
   std::string ticket_id_;
   std::string device_kind_ = "vendor";
-  std::string system_name_ = "coffee_pot";
+  std::string name_ = "coffee_pot";
   std::string display_name_ = "Coffee Pot";
 
   // HTTP transport used for communications.
diff --git a/buffet/device_registration_storage_keys.h b/buffet/device_registration_storage_keys.h
index a6c9239..2888f5e 100644
--- a/buffet/device_registration_storage_keys.h
+++ b/buffet/device_registration_storage_keys.h
@@ -22,7 +22,7 @@
 extern const char kRobotAccount[];
 // Transient keys
 extern const char kDeviceKind[];
-extern const char kSystemName[];
+extern const char kName[];
 extern const char kDisplayName[];
 
 }  // namespace storage_keys