diff --git a/core/modules/project_browser/config/project_browser.settings.yml b/core/modules/project_browser/config/project_browser.settings.yml
index de0b21c..d70f477 100644
--- a/core/modules/project_browser/config/project_browser.settings.yml
+++ b/core/modules/project_browser/config/project_browser.settings.yml
@@ -1,7 +1,8 @@
 cache_lifetime: 86400
 # @todo Change the link once drupal.org is ready.
-default_server:
-  http://drupal:drupal@pbs-drupal_7.redesign.devdrupal.org/project_browser/server:
+server:
+  default:
+    url: http://drupal:drupal@pbs-drupal_7.redesign.devdrupal.org/project_browser/server
     name: Drupal.org
     method: json
-project_browser_servers: ""
+  list: []
diff --git a/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php b/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php
index 9a4c855..65f4f20 100644
--- a/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php
+++ b/core/modules/project_browser/lib/Drupal/project_browser/Tests/ProjectBrowserTest.php
@@ -42,7 +42,7 @@ function setUp() {
     // Set the default server variable.
     $server_url = url('project_browser_test/query', array('absolute' => TRUE));
     $config = config('project_browser.settings');
-    $config->set('default_server', array(
+    $config->set('server.default', array(
       $server_url => array(
         'name' => 'Test Server',
         'method' => 'json',
diff --git a/core/modules/project_browser/project_browser.admin.inc b/core/modules/project_browser/project_browser.admin.inc
index 6c3ce41..880f240 100644
--- a/core/modules/project_browser/project_browser.admin.inc
+++ b/core/modules/project_browser/project_browser.admin.inc
@@ -20,15 +20,15 @@ function project_browser_admin_form($form, &$form_state) {
   );
   // Because this is a pluggable system, there can be other repositories besides
   // Drupal.org.
-  $form['main']['project_browser_servers'] = array(
+  $form['main']['server_list'] = array(
     '#type' => 'textarea',
     '#title' => t('Repositories'),
-    '#default_value' => config('project_browser.settings')->get('project_browser_servers'),
+    '#default_value' => config('project_browser.settings')->get('server.list'),
     '#description' => t("Add new repositories to use for the Project Browser, one per line, in the 'url|method|Site Name' format. Drupal.org is added by default, and doesn't need to be set here."),
     '#required' => FALSE,
   );
 
-  return $form;
+  return system_config_form($form, $form_state);
 }
 
 /**
@@ -36,6 +36,6 @@ function project_browser_admin_form($form, &$form_state) {
  */
 function project_browser_admin_form_submit($form, &$form_state) {
   $config = config('project_browser.settings');
-  $config->set('project_browser_servers', $form_state['values']['project_browser_servers']);
+  $config->set('server.list', $form_state['values']['server_list']);
   $config->save();
 }
diff --git a/core/modules/project_browser/project_browser.inc b/core/modules/project_browser/project_browser.inc
index 4fe50d1..f85b032 100644
--- a/core/modules/project_browser/project_browser.inc
+++ b/core/modules/project_browser/project_browser.inc
@@ -695,9 +695,11 @@ function project_browser_fetch_categories($type, $use_server = 'all') {
  *   project_browser_servers variable, in 'url => name' format.
  */
 function project_browser_get_servers($use_server = 'all') {
-  $servers = config('project_browser.settings')->get('default_server');
-
-  if ($servers_raw = config('project_browser.settings')->get('project_browser_servers')) {
+  $servers = config('project_browser.settings')->get('server.default');
+  $url = $servers['url'];
+  unset($servers['url']);
+  $default_server[$url] = $servers;
+  if ($servers_raw = config('project_browser.settings')->get('server.list')) {
     // Process the variable and add the servers to the list.
     $custom_servers = array();
 
@@ -722,7 +724,7 @@ function project_browser_get_servers($use_server = 'all') {
 
   // Filter out servers if necessary.
   // @todo Improve comment or variable name of $i.
-  // Interate through the server number.
+  // Iterate through the server number.
   if ($use_server !== 'all') {
     $i = 0;
     foreach ($servers as $url => $server) {
diff --git a/core/modules/project_browser/project_browser.module b/core/modules/project_browser/project_browser.module
index 3aa9227..93f1e36 100644
--- a/core/modules/project_browser/project_browser.module
+++ b/core/modules/project_browser/project_browser.module
@@ -51,11 +51,11 @@ function project_browser_permission() {
  */
 function project_browser_menu() {
   $items = array();
-  $items['admin/config/development/project_browser'] = array(
+  $items['admin/config/development/project-browser'] = array(
     'title' => 'Project Browser settings',
     'description' => 'Add new repositories and set other settings for Project Browser.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('project_browser_admin'),
+    'page arguments' => array('project_browser_admin_form'),
     'access arguments' => array('access administration pages'),
     'file' => 'project_browser.admin.inc',
   );