diff --git a/cod_base/cod_base.features.user_permission.inc b/cod_base/cod_base.features.user_permission.inc
index a5ac1ca..f4b0219 100644
--- a/cod_base/cod_base.features.user_permission.inc
+++ b/cod_base/cod_base.features.user_permission.inc
@@ -10,22 +10,21 @@
 function cod_base_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: access administration pages
+  // Exported permission: access administration pages.
   $permissions['access administration pages'] = array(
     'name' => 'access administration pages',
-    'roles' => array(
-      0 => 'site administrator',
-    ),
+    'roles' => array(),
     'module' => 'system',
   );
 
-  // Exported permission: access site reports
+  // Exported permission: access site reports.
   $permissions['access site reports'] = array(
     'name' => 'access site reports',
     'roles' => array(),
+    'module' => 'system',
   );
 
-  // Exported permission: access user profiles
+  // Exported permission: access user profiles.
   $permissions['access user profiles'] = array(
     'name' => 'access user profiles',
     'roles' => array(
@@ -35,47 +34,45 @@ function cod_base_user_default_permissions() {
     'module' => 'user',
   );
 
-  // Exported permission: administer permissions
+  // Exported permission: administer permissions.
   $permissions['administer permissions'] = array(
     'name' => 'administer permissions',
     'roles' => array(
-      0 => 'site administrator',
+      0 => 'administrator',
     ),
     'module' => 'user',
   );
 
-  // Exported permission: administer site configuration
+  // Exported permission: administer site configuration.
   $permissions['administer site configuration'] = array(
     'name' => 'administer site configuration',
-    'roles' => array(
-      0 => 'site administrator',
-    ),
+    'roles' => array(),
     'module' => 'system',
   );
 
-  // Exported permission: administer users
+  // Exported permission: administer users.
   $permissions['administer users'] = array(
     'name' => 'administer users',
     'roles' => array(
-      0 => 'site administrator',
+      0 => 'administrator',
     ),
     'module' => 'user',
   );
 
-  // Exported permission: administer views
+  // Exported permission: administer views.
   $permissions['administer views'] = array(
     'name' => 'administer views',
     'roles' => array(
-      0 => 'site administrator',
+      0 => 'administrator',
     ),
     'module' => 'views',
   );
 
-  // Exported permission: use admin toolbar
+  // Exported permission: use admin toolbar.
   $permissions['use admin toolbar'] = array(
     'name' => 'use admin toolbar',
     'roles' => array(
-      0 => 'site administrator',
+      0 => 'administrator',
     ),
     'module' => 'admin',
   );
diff --git a/cod_base/cod_base.features.user_role.inc b/cod_base/cod_base.features.user_role.inc
index 05c5c13..23c571f 100644
--- a/cod_base/cod_base.features.user_role.inc
+++ b/cod_base/cod_base.features.user_role.inc
@@ -10,9 +10,9 @@
 function cod_base_user_default_roles() {
   $roles = array();
 
-  // Exported role: site administrator
-  $roles['site administrator'] = array(
-    'name' => 'site administrator',
+  // Exported role: administrator.
+  $roles['administrator'] = array(
+    'name' => 'administrator',
     'weight' => '2',
   );
 
diff --git a/cod_base/cod_base.info b/cod_base/cod_base.info
index 1ee4146..d02cf66 100644
--- a/cod_base/cod_base.info
+++ b/cod_base/cod_base.info
@@ -1,29 +1,30 @@
-name = "COD Base"
-description = "Contains dependencies shared by other COD feature modules."
-core = "7.x"
-package = "COD"
-php = "5.2.4"
-project = "cod_base"
-dependencies[] = "admin"
-dependencies[] = "features"
-dependencies[] = "menu"
-dependencies[] = "strongarm"
-dependencies[] = "token"
-dependencies[] = "views"
-features[ctools][] = "strongarm:strongarm:1"
-features[field][] = "user-user-field_profile_first"
-features[field][] = "user-user-field_profile_interests"
-features[field][] = "user-user-field_profile_job_title"
-features[field][] = "user-user-field_profile_last"
-features[field][] = "user-user-field_profile_org"
-features[user_permission][] = "access administration pages"
-features[user_permission][] = "access site reports"
-features[user_permission][] = "access user profiles"
-features[user_permission][] = "administer permissions"
-features[user_permission][] = "administer site configuration"
-features[user_permission][] = "administer users"
-features[user_permission][] = "administer views"
-features[user_permission][] = "use admin toolbar"
-features[user_role][] = "site administrator"
-features[variable][] = "admin_toolbar"
-files[] = "cod_base.module"
+name = COD Base
+description = Contains dependencies shared by other COD feature modules.
+core = 7.x
+package = COD
+php = 5.2.4
+project = cod_base
+dependencies[] = admin
+dependencies[] = features
+dependencies[] = menu
+dependencies[] = strongarm
+dependencies[] = token
+dependencies[] = views
+features[ctools][] = strongarm:strongarm:1
+features[features_api][] = api:1
+features[field][] = user-user-field_profile_first
+features[field][] = user-user-field_profile_interests
+features[field][] = user-user-field_profile_job_title
+features[field][] = user-user-field_profile_last
+features[field][] = user-user-field_profile_org
+features[user_permission][] = access administration pages
+features[user_permission][] = access site reports
+features[user_permission][] = access user profiles
+features[user_permission][] = administer permissions
+features[user_permission][] = administer site configuration
+features[user_permission][] = administer users
+features[user_permission][] = administer views
+features[user_permission][] = use admin toolbar
+features[user_role][] = administrator
+features[variable][] = admin_toolbar
+files[] = cod_base.module
diff --git a/cod_base/cod_base.strongarm.inc b/cod_base/cod_base.strongarm.inc
index 0414ec3..3fc0ab8 100644
--- a/cod_base/cod_base.strongarm.inc
+++ b/cod_base/cod_base.strongarm.inc
@@ -10,7 +10,7 @@
 function cod_base_strongarm() {
   $export = array();
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'admin_toolbar';