diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index c2141761ef5283d142816b7c98258c2b591907d6..74eba7808283fd0ca4ca6eb30761e6a279c1f506 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,7 @@
+WCM Base 7.x-1.x, 2016-01-21
+-----------------------------
+- WCM Base: Renamed namespace-agnostic configuration features.
+
 WCM Base 7.x-1.x, 2016-01-15
 -----------------------------
 - WCM Base: Add Zurb Responsive Tables module.
diff --git a/profiles/wcm_base/build-wcm_base-dev.make b/profiles/wcm_base/build-wcm_base-dev.make
index affaab930d90a5c6394bf0608238cd3d5147799f..248b9c3fab76dc3f0591a767b5b42cdeba9b60e1 100644
--- a/profiles/wcm_base/build-wcm_base-dev.make
+++ b/profiles/wcm_base/build-wcm_base-dev.make
@@ -8,14 +8,14 @@ includes[core] = drupal-org-core.make
 includes[wcm_base] = wcm_base.make
 
 ;custom
-projects[ocio_accessibility][options][working-copy] = TRUE
+projects[wcm_accessibility][options][working-copy] = TRUE
 projects[ocio_admin_menu][options][working-copy] = TRUE
 projects[ocio_basic_page][options][working-copy] = TRUE
 projects[ocio_book][options][working-copy] = TRUE
 projects[ocio_buckeye_alert][options][working-copy] = TRUE
 projects[ocio_calendar][options][working-copy] = TRUE
 projects[ocio_web_form][options][working-copy] = TRUE
-projects[ocio_ds_settings][options][working-copy] = TRUE
+projects[wcm_ds_settings][options][working-copy] = TRUE
 projects[ocio_faqs][options][working-copy] = TRUE
 projects[ocio_featured_slideshow][options][working-copy] = TRUE
 projects[ocio_field_bases][options][working-copy] = TRUE
@@ -25,16 +25,16 @@ projects[ocio_main_menu][options][working-copy] = TRUE
 projects[ocio_media][options][working-copy] = TRUE
 projects[ocio_news][options][working-copy] = TRUE
 projects[ocio_omega_settings][options][working-copy] = TRUE
-projects[ocio_panels_settings][options][working-copy] = TRUE
-projects[ocio_permissions][options][working-copy] = TRUE
-projects[ocio_search][options][working-copy] = TRUE
+projects[wcm_panels_settings][options][working-copy] = TRUE
+projects[wcm_permissions][options][working-copy] = TRUE
+projects[wcm_search][options][working-copy] = TRUE
 projects[ocio_simplesamlphp_auth][options][working-copy] = TRUE
 projects[ocio_siteinfo][options][working-copy] = TRUE
 projects[ocio_taxonomy][options][working-copy] = TRUE
-projects[ocio_url_aliases][options][working-copy] = TRUE
-projects[ocio_user_config][options][working-copy] = TRUE
-projects[ocio_uuid_settings][options][working-copy] = TRUE
-projects[ocio_workbench][options][working-copy] = TRUE
+projects[wcm_url_aliases][options][working-copy] = TRUE
+projects[wcm_user_config][options][working-copy] = TRUE
+projects[wcm_uuid_settings][options][working-copy] = TRUE
+projects[wcm_workbench][options][working-copy] = TRUE
 projects[ocio_wysiwyg][options][working-copy] = TRUE
 projects[wcm_front_page][options][working-copy] = TRUE
 projects[wcm_media_gallery][options][working-copy] = TRUE
diff --git a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.module b/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.module
deleted file mode 100644
index 0d7b91107ed89a949fa73af27936802660ead26a..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.module
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Code for the OCIO DS Settings feature.
- */
-
-include_once 'ocio_ds_settings.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.module b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.module
deleted file mode 100644
index 68a8ed7a7bc0245b5c3f42d592deca7445e0d7fa..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.module
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Code for the OCIO Permissions feature.
- */
-
-include_once 'ocio_permissions.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.module b/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.module
deleted file mode 100644
index 9533799605eab6b5098753cb5537279400d7d261..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.module
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Code for the OCIO URL Aliases feature.
- */
-
-include_once 'ocio_url_aliases.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.features.inc b/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.features.inc
deleted file mode 100644
index bf3c486efaa5bf551f4ff726a7304d5a8f006a7f..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.features.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @file
- * ocio_uuid_settings.features.inc
- */
-
-/**
- * Implements hook_ctools_plugin_api().
- */
-function ocio_uuid_settings_ctools_plugin_api($module = NULL, $api = NULL) {
-  if ($module == "strongarm" && $api == "strongarm") {
-    return array("version" => "1");
-  }
-}
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/README.md b/profiles/wcm_base/modules/custom/wcm_accessibility/README.md
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_accessibility/README.md
rename to profiles/wcm_base/modules/custom/wcm_accessibility/README.md
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.features.inc b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.features.inc
similarity index 60%
rename from profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.features.inc
rename to profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.features.inc
index 5f8759792ca3c4d1be3ab22b2368d3ce847d706a..9936fe7ba138a9d6c6e2d05f09466ac5c59b50c7 100644
--- a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_accessibility.features.inc
+ * wcm_accessibility.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_accessibility_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_accessibility_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.info
similarity index 85%
rename from profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info
rename to profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.info
index 9f9613075a30249d92e5a82213914a6a15a5acfa..38d04d4d3e03a4eb89a2a88347c81daf952603e2 100644
--- a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info
+++ b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.info
@@ -1,9 +1,9 @@
-name = OCIO Accessibility
-description = Accessibility settings and configuration
+name = "WCM Accessibility"
+description = "Accessibility settings and configuration"
 core = 7.x
-package = OCIO Features
+package = WCM Features
 version = 7.x-1.0
-project = ocio_accessibility
+project = wcm_accessibility
 dependencies[] = ctools
 dependencies[] = extlink
 dependencies[] = features
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.make b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.make
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.make
rename to profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.make
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.module b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.module
similarity index 58%
rename from profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.module
rename to profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.module
index d69358d7d51f495caa5b6e9dccefd9a3ad6aa104..b0042c907815ce0b6c0e8d06636e942664cc5b1a 100644
--- a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.module
+++ b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.module
@@ -4,4 +4,4 @@
  * Code for the OCIO Accessibility feature.
  */
 
-include_once 'ocio_accessibility.features.inc';
+include_once 'wcm_accessibility.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.strongarm.inc
similarity index 98%
rename from profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.strongarm.inc
index 692781b8ca06205d0e9adabe5cff07a936017108..b17263b7456e5cb516fda09e6a9eec5f7443a185 100644
--- a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_accessibility/wcm_accessibility.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_accessibility.strongarm.inc
+ * wcm_accessibility.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_accessibility_strongarm() {
+function wcm_accessibility_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_ds_settings/README b/profiles/wcm_base/modules/custom/wcm_ds_settings/README
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_ds_settings/README
rename to profiles/wcm_base/modules/custom/wcm_ds_settings/README
diff --git a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.features.filter.inc b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.features.filter.inc
similarity index 78%
rename from profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.features.filter.inc
rename to profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.features.filter.inc
index 62eb0eceb12e68805561e2ba476e9d8fc420da73..8499282ae32e1148026c825eac3d96c7e638fe7e 100644
--- a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.features.filter.inc
+++ b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.features.filter.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_ds_settings.features.filter.inc
+ * wcm_ds_settings.features.filter.inc
  */
 
 /**
  * Implements hook_filter_default_formats().
  */
-function ocio_ds_settings_filter_default_formats() {
+function wcm_ds_settings_filter_default_formats() {
   $formats = array();
 
   // Exported format: Display Suite code.
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.features.inc b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.features.inc
similarity index 61%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.features.inc
rename to profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.features.inc
index 2b35211f020abafa4cfda4a10d23a912ce565704..35a4c6428ba8820490e1c6eb35429638cf78f679 100644
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_url_aliases.features.inc
+ * wcm_ds_settings.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_url_aliases_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_ds_settings_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.info b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.info
similarity index 91%
rename from profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.info
rename to profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.info
index fe17d89e87dd4d9c9e14f32da127609a735f604b..cfee6837e19d8605776840cbb898c998d5f0a258 100644
--- a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.info
+++ b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.info
@@ -1,9 +1,9 @@
-name = OCIO DS Settings
+name = WCM DS Settings
 description = Default settings for Display Suite
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_ds_settings
+project = wcm_ds_settings
 dependencies[] = ctools
 dependencies[] = ds
 dependencies[] = ds_ui
diff --git a/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.module b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.module
new file mode 100644
index 0000000000000000000000000000000000000000..81232fd4534c8b3a4662e28df3a36d12cf234d72
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the WCM DS Settings feature.
+ */
+
+include_once 'wcm_ds_settings.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.strongarm.inc
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.strongarm.inc
index d7c74465c6fb5be8f6187bba0ef4c82359b33839..9d61ebb084f5ac9d4a0bb7d0c0254978e9378b3b 100644
--- a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_ds_settings/wcm_ds_settings.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_ds_settings.strongarm.inc
+ * wcm_ds_settings.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_ds_settings_strongarm() {
+function wcm_ds_settings_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/plugins/styles/sidebar/sidebar.inc b/profiles/wcm_base/modules/custom/wcm_panels_settings/plugins/styles/sidebar/sidebar.inc
similarity index 74%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/plugins/styles/sidebar/sidebar.inc
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/plugins/styles/sidebar/sidebar.inc
index 7693e7ee52d9084950e0ca91f86292a2aae03840..cd8e2bd19e06bd5513735878b6a7c0a13921bd86 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/plugins/styles/sidebar/sidebar.inc
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/plugins/styles/sidebar/sidebar.inc
@@ -9,14 +9,14 @@
 $plugin = array(
   'title' => t('Sidebar Style'),
   'description' => t('Make panel appear as sidebar.'),
-  'render region' => 'ocio_panels_settings_sidebar_style_render_region',
+  'render region' => 'wcm_panels_settings_sidebar_style_render_region',
   'hook theme' => array(
     'sidebar_panel' => array(
       'variables' => array(
         'content' =>   NULL,
         'style_attributes' => array(),
       ),
-      'path' => drupal_get_path('module', 'ocio_panels_settings') . '/plugins/styles/sidebar',
+      'path' => drupal_get_path('module', 'wcm_panels_settings') . '/plugins/styles/sidebar',
       'template' => 'sidebar',
     ),
   ),
@@ -27,7 +27,7 @@ $plugin = array(
  *
  * @ingroup themeable
  */
-function theme_ocio_panels_settings_sidebar_style_render_region($vars) {
+function theme_wcm_panels_settings_sidebar_style_render_region($vars) {
 
   $style_attributes = array(
     'class' => array(
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/plugins/styles/sidebar/sidebar.tpl.php b/profiles/wcm_base/modules/custom/wcm_panels_settings/plugins/styles/sidebar/sidebar.tpl.php
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/plugins/styles/sidebar/sidebar.tpl.php
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/plugins/styles/sidebar/sidebar.tpl.php
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc
similarity index 98%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc
index 195b75ad2010180674204f70375698aa120d9a22..6aef021b6f70ad1193c32f611b4bdf1f09cd4a3d 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_panels_settings.features.features_overrides.inc
+ * wcm_panels_settings.features.features_overrides.inc
  */
 
 /**
  * Implements hook_features_override_default_overrides().
  */
-function ocio_panels_settings_features_override_default_overrides() {
+function wcm_panels_settings_features_override_default_overrides() {
   // This code is only used for UI in features. Exported alters hooks do the magic.
   $overrides = array();
 
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc
index ed9a62ffe1b0ad86c49d2c672ffc89c73ff81b76..83e7a25287fdbee7928bbf7fb7938793cd7c4784 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_panels_settings.features.inc
+ * wcm_panels_settings.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_panels_settings_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_panels_settings_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
@@ -16,7 +16,7 @@ function ocio_panels_settings_ctools_plugin_api($module = NULL, $api = NULL) {
 /**
  * Implements hook_field_default_field_instances_alter().
  */
-function ocio_panels_settings_field_default_field_instances_alter(&$data) {
+function wcm_panels_settings_field_default_field_instances_alter(&$data) {
   if (isset($data['fieldable_panels_pane-image-field_basic_image_image'])) {
     $data['fieldable_panels_pane-image-field_basic_image_image']['display']['default']['settings']['image_style'] = 'image_style_full'; /* WAS: 'panopoly_image_full' */
     $data['fieldable_panels_pane-image-field_basic_image_image']['ds_extras_field_template'] = ''; /* WAS: '' */
@@ -50,7 +50,7 @@ function ocio_panels_settings_field_default_field_instances_alter(&$data) {
 /**
  * Implements hook_default_page_manager_handlers_alter().
  */
-function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
+function wcm_panels_settings_default_page_manager_handlers_alter(&$data) {
   if (isset($data['node_edit_panel_context'])) {
     $data['node_edit_panel_context']->conf['display']->content['new-08dde41f-c835-4e3a-b0ef-28191ff0275d'] = (object) array(
           'pid' => 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d',
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info
index 6aba8a79e0825c44eb34cabb8ea9138cd04d2a51..af1bc7aa4373ed7cde7f7fbb5c37206df08b81f2 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info
@@ -1,9 +1,9 @@
-name = OCIO Panels Settings
-description = Default settings for Panels on OCIOpoly and ODEE Base sites.
+name = WCM Panels Settings
+description = Default settings for Panels on WCM sites.
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_panels_settings
+project = wcm_panels_settings
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = features_override
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.make
similarity index 87%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.make
index 97dcdeea6b5758afa20e70d5f79b029806dcaa8d..179a1ccfa7074e3340e0e591b5f09517b9441668 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.make
@@ -1,4 +1,4 @@
-; OCIO Panels Settings Makefile
+; WCM Panels Settings Makefile
 
 api = 2
 core = 7.x
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module
similarity index 72%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module
index ee62ae6bf5a2989030df6be44cfe4f5557a275c3..1c792dcae4ee7a053d783b6bbd51b4ea256099f8 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module
@@ -1,29 +1,29 @@
 <?php
 /**
  * @file
- * Code for the OCIO Panels Settings feature.
+ * Code for the WCM Panels Settings feature.
  */
 
-include_once 'ocio_panels_settings.features.inc';
+include_once 'wcm_panels_settings.features.inc';
 
 /**
  * Implementation of hook_ctools_plugin_directory()
  */
-function ocio_panels_settings_ctools_plugin_directory($module, $plugin) {
+function wcm_panels_settings_ctools_plugin_directory($module, $plugin) {
   return 'plugins/' . $plugin;
 }
 
 /*
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_panels_settings_form_views_content_views_panes_content_type_edit_form_alter(&$form, &$form_state) {
-  $form['#after_build'][] = '_ocio_panels_settings_content_pane_settings';
+function wcm_panels_settings_form_views_content_views_panes_content_type_edit_form_alter(&$form, &$form_state) {
+  $form['#after_build'][] = '_wcm_panels_settings_content_pane_settings';
 }
 
 /*
  * Modify form after build.
  */
-function _ocio_panels_settings_content_pane_settings($form) {
+function _wcm_panels_settings_content_pane_settings($form) {
  //$form['display_settings']['view_settings']['#access'] = FALSE;
   $form['display_settings']['header_type']['#access'] = FALSE;
   $form['content_settings']['#access'] = FALSE;
@@ -33,14 +33,14 @@ function _ocio_panels_settings_content_pane_settings($form) {
 /*
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_panels_settings_form_panels_edit_style_type_form_alter(&$form, &$form_state) {
-  $form['#after_build'][] = '_ocio_panels_settings_region_style_settings';
+function wcm_panels_settings_form_panels_edit_style_type_form_alter(&$form, &$form_state) {
+  $form['#after_build'][] = '_wcm_panels_settings_region_style_settings';
 }
 
 /*
  * Modify form after build.
  */
-function _ocio_panels_settings_region_style_settings($form) {
+function _wcm_panels_settings_region_style_settings($form) {
   $form['style']['style']['list']['#access'] = FALSE;
   $form['style']['style']['panopoly_accordion']['#access'] = FALSE;
   return $form;
@@ -51,7 +51,7 @@ function _ocio_panels_settings_region_style_settings($form) {
  *
  * Simplify form for fpp. Remove the option for title as a link.
  */
-function ocio_panels_settings_form_fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_alter(&$form, &$form_state) {
+function wcm_panels_settings_form_fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_alter(&$form, &$form_state) {
   $form['link']['#access'] = FALSE;
   $form['redirect']['#access'] = FALSE;
 }
@@ -59,7 +59,7 @@ function ocio_panels_settings_form_fieldable_panels_panes_fieldable_panels_pane_
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_panels_settings_form_mm_widgets_live_pane_edit_form_alter(&$form, &$form_state) {
+function wcm_panels_settings_form_mm_widgets_live_pane_edit_form_alter(&$form, &$form_state) {
   $form['override_title']['#default_value'] = 1;
   $form['override_title']['#access'] = FALSE;
   $form['override_title_markup']['#access'] = FALSE;
@@ -72,20 +72,20 @@ function ocio_panels_settings_form_mm_widgets_live_pane_edit_form_alter(&$form,
   $form['display_settings']['items_limit'] = $form['items_limit'];
   unset($form['items_limit']);
 
-  array_unshift($form['#submit'], 'ocio_panels_settings_form_mm_widgets_live_pane_edit_form_submit');
+  array_unshift($form['#submit'], 'wcm_panels_settings_form_mm_widgets_live_pane_edit_form_submit');
 }
 
 /**
  * Submit handler for mm_widgets_live_pane form.
  */
-function ocio_panels_settings_form_mm_widgets_live_pane_edit_form_submit($form, &$form_state) {
+function wcm_panels_settings_form_mm_widgets_live_pane_edit_form_submit($form, &$form_state) {
   $form_state['values']['override_title'] = !empty($form_state['values']['override_title_text']);
 }
 
 /*
  * Implements hook_panopoly_magic_forms_to_improve_alter().
  */
-function ocio_panels_settings_panopoly_magic_forms_to_improve_alter(&$form_ids) {
+function wcm_panels_settings_panopoly_magic_forms_to_improve_alter(&$form_ids) {
   $form_ids[] = 'mm_widgets_live_pane_edit_form';
 }
 
@@ -94,7 +94,7 @@ function ocio_panels_settings_panopoly_magic_forms_to_improve_alter(&$form_ids)
  *
  * Only show media magnet channel icon once if only one channel is being selected.
  */
-function ocio_panels_settings_panels_pane_prerender($pane) {
+function wcm_panels_settings_panels_pane_prerender($pane) {
   if ($pane->type == 'mm_widgets_live_pane') {
     parse_str($pane->configuration['items_query'], $query);
 
@@ -129,7 +129,7 @@ function ocio_panels_settings_panels_pane_prerender($pane) {
  */
 
 /*
-function ocio_panels_settings_preprocess_panels_add_content_modal(&$vars) {
+function wcm_panels_settings_preprocess_panels_add_content_modal(&$vars) {
   if ($vars['region'] != 'header') {
     // Here's how to restrict what can be added to each panels region.
 
@@ -154,7 +154,7 @@ function ocio_panels_settings_preprocess_panels_add_content_modal(&$vars) {
  *
  * Make private node field accessible to non-administrators.
  */
-function ocio_panels_settings_form_node_form_alter(&$form, &$form_state) {
+function wcm_panels_settings_form_node_form_alter(&$form, &$form_state) {
 
   if (!empty($form['private'])) {
     $access = user_access('edit private content') && user_access('mark content as private');
@@ -192,10 +192,10 @@ function ocio_panels_settings_form_node_form_alter(&$form, &$form_state) {
  *
  * Force the above form alter hook to execute after the Private module's hook.
  */
-function ocio_panels_settings_module_implements_alter(&$implementations, $hook) {
-  if ($hook == 'form_alter'  && isset($implementations['ocio_panels_settings'], $implementations['private'])) {
-    $group = $implementations['ocio_panels_settings'];
-    unset($implementations['ocio_panels_settings']);
-    $implementations['ocio_panels_settings'] = $group;
+function wcm_panels_settings_module_implements_alter(&$implementations, $hook) {
+  if ($hook == 'form_alter'  && isset($implementations['wcm_panels_settings'], $implementations['private'])) {
+    $group = $implementations['wcm_panels_settings'];
+    unset($implementations['wcm_panels_settings']);
+    $implementations['wcm_panels_settings'] = $group;
   }
 }
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.strongarm.inc
similarity index 99%
rename from profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.strongarm.inc
index 535b05cebc629ddef050e425dbb36c34028d615e..b08fb958737c3b4b6543dc13919e2c091797caf8 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_panels_settings.strongarm.inc
+ * wcm_panels_settings.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_panels_settings_strongarm() {
+function wcm_panels_settings_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/README b/profiles/wcm_base/modules/custom/wcm_permissions/README
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_permissions/README
rename to profiles/wcm_base/modules/custom/wcm_permissions/README
diff --git a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.features.inc b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.inc
similarity index 61%
rename from profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.features.inc
rename to profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.inc
index d3bf913a087cc3835c9cf1358c8413ad13401cc5..9d3819fc520d42f806577e528c820fcb8be05466 100644
--- a/profiles/wcm_base/modules/custom/ocio_ds_settings/ocio_ds_settings.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_ds_settings.features.inc
+ * wcm_permissions.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_ds_settings_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_permissions_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc
similarity index 99%
rename from profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
rename to profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc
index b8ba2bc300d5b39c790f0c07180fc400bcd42dd7..9057c5c8e70e2e7eb1ccdd1e9fe8e55988281929 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_permissions.features.user_permission.inc
+ * wcm_permissions.features.user_permission.inc
  */
 
 /**
  * Implements hook_user_default_permissions().
  */
-function ocio_permissions_user_default_permissions() {
+function wcm_permissions_user_default_permissions() {
   $permissions = array();
 
   // Exported permission: 'access admin lock'.
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info
similarity index 99%
rename from profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
rename to profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info
index b855969999fd67b8609a1255a28bb7736380ded2..4c20d897a1218322fbb0c34305f304588f3c084f 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info
@@ -1,9 +1,9 @@
-name = OCIO Permissions
+name = WCM Permissions
 description = Permissions specific to the WCM distribution.
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_permissions
+project = wcm_permissions
 dependencies[] = administerusersbyrole
 dependencies[] = aggregator
 dependencies[] = block
diff --git a/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.module b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.module
new file mode 100644
index 0000000000000000000000000000000000000000..dafdee12d18fc6ef24e9e0939a080c8806712ac3
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the WCM Permissions feature.
+ */
+
+include_once 'wcm_permissions.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.strongarm.inc
similarity index 85%
rename from profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.strongarm.inc
index 8c93dc632d323a3c1f7208d1e580f6609c04f4f0..4166115578bfc93003905b6a08e1d57020994c5b 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_permissions.strongarm.inc
+ * wcm_permissions.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_permissions_strongarm() {
+function wcm_permissions_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_search/README.md b/profiles/wcm_base/modules/custom/wcm_search/README.md
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_search/README.md
rename to profiles/wcm_base/modules/custom/wcm_search/README.md
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.apachesolr_environments.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.apachesolr_environments.inc
similarity index 90%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.apachesolr_environments.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.apachesolr_environments.inc
index 3f1f6013cfa82c5e47ac929ec1fa9f26fd716309..065c5c1dd197e58d7c79d7c853ca47c57f21842a 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.apachesolr_environments.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.apachesolr_environments.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.apachesolr_environments.inc
+ * wcm_search.apachesolr_environments.inc
  */
 
 /**
  * Implements hook_apachesolr_environments().
  */
-function ocio_search_apachesolr_environments() {
+function wcm_search_apachesolr_environments() {
   $export = array();
 
   $environment = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.apachesolr_search_defaults.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.apachesolr_search_defaults.inc
similarity index 95%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.apachesolr_search_defaults.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.apachesolr_search_defaults.inc
index 9a5e349119011577d6d506fd4c757ba6778b57cc..f53a1094a0cb776cde8888865f3f9412341f53bb 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.apachesolr_search_defaults.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.apachesolr_search_defaults.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.apachesolr_search_defaults.inc
+ * wcm_search.apachesolr_search_defaults.inc
  */
 
 /**
  * Implements hook_apachesolr_search_default_searchers().
  */
-function ocio_search_apachesolr_search_default_searchers() {
+function wcm_search_apachesolr_search_default_searchers() {
   $export = array();
 
   $searcher = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.context.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.context.inc
similarity index 86%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.context.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.context.inc
index 0cddbf9f67b3f6b568324a417933aaa37bc3fc67..2b0c101e02396bdbe0951437c50a02fdf99d53aa 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.context.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.context.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.context.inc
+ * wcm_search.context.inc
  */
 
 /**
  * Implements hook_context_default_contexts().
  */
-function ocio_search_context_default_contexts() {
+function wcm_search_context_default_contexts() {
   $export = array();
 
   $context = new stdClass();
@@ -15,7 +15,7 @@ function ocio_search_context_default_contexts() {
   $context->api_version = 3;
   $context->name = 'search';
   $context->description = '';
-  $context->tag = 'OCIO Search';
+  $context->tag = 'WCM Search';
   $context->conditions = array(
     'sitewide' => array(
       'values' => array(
@@ -39,7 +39,7 @@ function ocio_search_context_default_contexts() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('OCIO Search');
+  t('WCM Search');
   $export['search'] = $context;
 
   return $export;
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.content_menu_links.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.content_menu_links.inc
similarity index 95%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.content_menu_links.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.content_menu_links.inc
index bd4d3859c117fbdf533c67705c41fea18188891b..c46577826cf6ef6360bc29745117060b1e6ea036 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.content_menu_links.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.content_menu_links.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.features.content_menu_links.inc
+ * wcm_search.features.content_menu_links.inc
  */
 
 /**
  * Implements hook_content_menu_links_defaults().
  */
-function ocio_search_content_menu_links_defaults() {
+function wcm_search_content_menu_links_defaults() {
   $menu_links = array();
 
   // Exported menu link: management:admin/config/search/apachesolr
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.defaultconfig.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.defaultconfig.inc
similarity index 92%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.defaultconfig.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.defaultconfig.inc
index 40a86debc92e8d2613cf5f239a6814f636959f0e..b7b4e3fa37fe2f5df79635acc09b39dbfedb65b5 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.defaultconfig.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.defaultconfig.inc
@@ -1,15 +1,15 @@
 <?php
 /**
  * @file
- * ocio_search.features.defaultconfig.inc
+ * wcm_search.features.defaultconfig.inc
  */
 
 /**
  * Implements hook_defaultconfig_features().
  */
-function ocio_search_defaultconfig_features() {
+function wcm_search_defaultconfig_features() {
   return array(
-    'ocio_search' => array(
+    'wcm_search' => array(
       'apachesolr_search_default_searchers' => 'apachesolr_search_default_searchers',
     ),
   );
@@ -18,7 +18,7 @@ function ocio_search_defaultconfig_features() {
 /**
  * Implements hook_defaultconfig_apachesolr_search_default_searchers().
  */
-function ocio_search_defaultconfig_apachesolr_search_default_searchers() {
+function wcm_search_defaultconfig_apachesolr_search_default_searchers() {
   $export = array();
 
   $searcher = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.fe_block_settings.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.fe_block_settings.inc
similarity index 94%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.fe_block_settings.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.fe_block_settings.inc
index 8ac07487d0f8c63b793e38328c24c46516e588a2..98940ed0d327d28c7750d9b4b9ee63443139efb5 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.fe_block_settings.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.fe_block_settings.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.features.fe_block_settings.inc
+ * wcm_search.features.fe_block_settings.inc
  */
 
 /**
  * Implements hook_default_fe_block_settings().
  */
-function ocio_search_default_fe_block_settings() {
+function wcm_search_default_fe_block_settings() {
   $export = array();
 
   $export['version'] = '2.0';
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.features_overrides.inc
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.features_overrides.inc
index a04017de38dd233d5996f52d46e0ca7f2a4f86f6..052342ae6dc090a41f8994562ea6b9b7d45141c3 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.features_overrides.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.features.features_overrides.inc
+ * wcm_search.features.features_overrides.inc
  */
 
 /**
  * Implements hook_features_override_default_overrides().
  */
-function ocio_search_features_override_default_overrides() {
+function wcm_search_features_override_default_overrides() {
   // This code is only used for UI in features. Exported alters hooks do the magic.
   $overrides = array();
 
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.inc
similarity index 94%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.inc
index 1b30bea65f6fb8a2f53a926a831f10e1d548203f..33e0f48c06c03ad799dad14e453e4e4f37de88c1 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.features.inc
+ * wcm_search.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_search_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_search_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "apachesolr" && $api == "apachesolr_environments") {
     return array("version" => "1");
   }
@@ -25,7 +25,7 @@ function ocio_search_ctools_plugin_api($module = NULL, $api = NULL) {
 /**
  * Implements hook_default_search_api_index_alter().
  */
-function ocio_search_default_search_api_index_alter(&$data) {
+function wcm_search_default_search_api_index_alter(&$data) {
   if (isset($data['database_node_index'])) {
     $data['database_node_index']->options['data_alter_callbacks']['search_api_alter_add_viewed_entity']['status'] = 0; /* WAS: 1 */
     unset($data['database_node_index']->options['fields']['search_api_viewed']);
@@ -56,7 +56,7 @@ function ocio_search_default_search_api_index_alter(&$data) {
 /**
  * Implements hook_default_search_api_server_alter().
  */
-function ocio_search_default_search_api_server_alter(&$data) {
+function wcm_search_default_search_api_server_alter(&$data) {
   if (isset($data['database_server'])) {
     unset($data['database_server']->options['indexes']['database_node_index']['search_api_viewed']);
   }
@@ -65,7 +65,7 @@ function ocio_search_default_search_api_server_alter(&$data) {
 /**
  * Implements hook_views_default_views_alter().
  */
-function ocio_search_views_default_views_alter(&$data) {
+function wcm_search_views_default_views_alter(&$data) {
   if (isset($data['panopoly_search'])) {
     $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['breadcrumb'] = 'test'; /* WAS: '' */
     $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['breadcrumb_enable'] = TRUE; /* WAS: '' */
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.info b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.info
similarity index 98%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.info
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.info
index 12fc4ee34b6a2dbb70a9e51a2dc405a0c22bf4f1..722b0e0283c3fd69a79f38583e454370904cc5dc 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.info
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.info
@@ -1,9 +1,9 @@
-name = OCIO Search
+name = WCM Search
 description = Apache Solr search configuration.
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_search
+project = wcm_search
 dependencies[] = apachesolr
 dependencies[] = apachesolr_file
 dependencies[] = apachesolr_search
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.install b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.install
similarity index 71%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.install
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.install
index 1debc16e4b2a8c8ca171d673699bb0425371ac65..6d3359d9d8963504943e91c903f32ae5565791e9 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.install
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.install
@@ -3,12 +3,12 @@
 /**
  * Implements hook_install().
  */
-function ocio_search_install() {
+function wcm_search_install() {
   // Post Pantheon Apache Solr schema and set variable.
   $posted = array(
     'dev' => FALSE,
     'test' => FALSE,
     'live' => FALSE
   );
-  ocio_search_solr_post_schema($posted);
+  wcm_search_solr_post_schema($posted);
 }
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.make b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.make
similarity index 92%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.make
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.make
index 6d67f7897df4924333a1457cf81b12a971c7831d..fd770934093269bd02427bddde2a65c4d6ce4bce 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.make
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.make
@@ -1,4 +1,4 @@
-; OCIO Search Makefile
+; WCM Search Makefile
 
 api = 2
 core = 7.x
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.module
similarity index 63%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.module
index ef8670c56aa9533a6c32303f1a54c717a476a28e..cb6f84c9797b5313f146363d1d905b8b00138156 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.module
@@ -1,15 +1,15 @@
 <?php
 /**
  * @file
- * Code for the OCIO Search feature.
+ * Code for the WCM Search feature.
  */
 
-include_once 'ocio_search.features.inc';
+include_once 'wcm_search.features.inc';
 
 /**
  * Implements hook_cron().
  */
-function ocio_search_cron() {
+function wcm_search_cron() {
   $env = variable_get('pantheon_environment');
   $posted = variable_get('pantheon_schema_posted');
   if (empty($posted) || !isset($posted[$env])) {
@@ -19,14 +19,14 @@ function ocio_search_cron() {
   // If Solr schema has not been posted in the current environment,
   // post schema and set variable to prevent posting on each cron run.
   if (!$posted[$env]) {
-    ocio_search_solr_post_schema($posted, $env);
+    wcm_search_solr_post_schema($posted, $env);
   }
 }
 
 /**
  * Posts Solr schema and returns schema status.
  */
-function ocio_search_solr_post_schema($posted, $env = '') {
+function wcm_search_solr_post_schema($posted, $env = '') {
 
   if (function_exists('pantheon_apachesolr_post_schema_exec')) {
 
@@ -35,7 +35,7 @@ function ocio_search_solr_post_schema($posted, $env = '') {
     $result = !empty($post);
 
     if ($result) {
-      watchdog('ocio_search', 'ApacheSolr schema posted');
+      watchdog('wcm_search', 'ApacheSolr schema posted');
     }
 
     if (empty($env)) {
@@ -50,8 +50,8 @@ function ocio_search_solr_post_schema($posted, $env = '') {
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_search_form_search_block_form_alter(&$form, &$form_state) {
-  $form['#prefix'] = '<div id="ocio-search"><span id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></span>';
+function wcm_search_form_search_block_form_alter(&$form, &$form_state) {
+  $form['#prefix'] = '<div id="wcm-search"><span id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></span>';
   $form['search_block_form']['#attributes']['placeholder'] = t('Search');
   $form['actions']['submit']['#value'] = t('Go');
   $form['#suffix'] = '</div>';
@@ -60,16 +60,16 @@ function ocio_search_form_search_block_form_alter(&$form, &$form_state) {
 /**
  * Implementation of hook_form_alter()
  */
-function ocio_search_form_alter(&$form, &$form_state, $form_id) {
+function wcm_search_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'search_form' || $form_id == 'search_block_form' || $form_id == 'search_theme_form') {
-    $form['#submit'][] = 'ocio_search_form_submit';
+    $form['#submit'][] = 'wcm_search_form_submit';
   }
 }
 
 /**
  * Custom form submit handler to change redirect state of the form
  */
-function ocio_search_form_submit($form, &$form_state) {
+function wcm_search_form_submit($form, &$form_state) {
 
   if (!isset($form_state['values']['keys'])) {
     $keys = trim($form_state['values'][$form['#form_id']]);
@@ -85,10 +85,10 @@ function ocio_search_form_submit($form, &$form_state) {
  * Implements hook_module_implements_alter().
  *
  */
-function ocio_search_module_implements_alter(&$implementations, $hook) {
-  if ($hook == 'form_alter'  && isset($implementations['ocio_search'])) {
-    $group = $implementations['ocio_search'];
-    unset($implementations['ocio_search']);
-    $implementations['ocio_search'] = $group;
+function wcm_search_module_implements_alter(&$implementations, $hook) {
+  if ($hook == 'form_alter'  && isset($implementations['wcm_search'])) {
+    $group = $implementations['wcm_search'];
+    unset($implementations['wcm_search']);
+    $implementations['wcm_search'] = $group;
   }
 }
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.strongarm.inc
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_search/ocio_search.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_search/wcm_search.strongarm.inc
index b56cd33e3a109c60b50d387fe9c704ebf9a0b9c7..9de136f7946d8cf7c2848746f45b31230a49b11c 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_search/wcm_search.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_search.strongarm.inc
+ * wcm_search.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_search_strongarm() {
+function wcm_search_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/README b/profiles/wcm_base/modules/custom/wcm_url_aliases/README
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/README
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/README
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.inc b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.features.inc
similarity index 61%
rename from profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.inc
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.features.inc
index 6ce9a77f98f25bd20c27e5cd52d92caec725991e..a475b59616b160d003a928cfe1e04d94fcfce3e6 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_permissions.features.inc
+ * wcm_url_aliases.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_permissions_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_url_aliases_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.features.user_permission.inc b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.features.user_permission.inc
similarity index 78%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.features.user_permission.inc
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.features.user_permission.inc
index 0f54adc94dc70c517485d8cccdf95d10592b1edd..6a514723089c42a613f5916fd156c2c1ea6212fa 100644
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.features.user_permission.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_url_aliases.features.user_permission.inc
+ * wcm_url_aliases.features.user_permission.inc
  */
 
 /**
  * Implements hook_user_default_permissions().
  */
-function ocio_url_aliases_user_default_permissions() {
+function wcm_url_aliases_user_default_permissions() {
   $permissions = array();
 
   // Exported permission: 'administer redirects'.
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.info b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.info
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.info
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.info
index bc82c4934d5be030f57c44dd82b7eb873fac838f..9a7c94110bd1f4fc5434d2089c96c2dc49ea56a5 100644
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.info
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.info
@@ -1,9 +1,9 @@
-name = OCIO URL Aliases
+name = WCM URL Aliases
 description = Pathauto pattern settings
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_url_aliases
+project = wcm_url_aliases
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = path
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.install b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.install
similarity index 50%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.install
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.install
index 48c6af00654e8bc31e18277d3dc046b3241d8081..fb2c4df9a0521aa8a1011e1794fe1391438488c7 100644
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.install
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.install
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Install, uninstall, and updates for OCIO URL Aliases.
+ * Install, uninstall, and updates for WCM URL Aliases.
  */
 
 /**
  * Enable Pathologic module.
  */
-function ocio_url_aliases_update_7001() {
+function wcm_url_aliases_update_7001() {
   module_enable(array('pathologic'));
 }
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.make b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.make
similarity index 87%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.make
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.make
index 6b1f78eb7f35049594ab3f7b53d58d3d4044c4fc..68da32bd0dd93776f858acf522cb7aa6efa1ebe9 100644
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.make
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.make
@@ -1,4 +1,4 @@
-; OCIO Usr Config Makefile
+; WCM User Config Makefile
 
 api = 2
 core = 7.x
diff --git a/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.module b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.module
new file mode 100644
index 0000000000000000000000000000000000000000..7221e8f643d6e90d7de49af7356a8f9d07912c5a
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the WCM URL Aliases feature.
+ */
+
+include_once 'wcm_url_aliases.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.strongarm.inc
similarity index 99%
rename from profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.strongarm.inc
index 7c399ce5c8a12d421a501d5f205d431dd866a372..6c2e801ed1611b7539d7de3fa6af01e1d21670b8 100644
--- a/profiles/wcm_base/modules/custom/ocio_url_aliases/ocio_url_aliases.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_url_aliases/wcm_url_aliases.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_url_aliases.strongarm.inc
+ * wcm_url_aliases.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_url_aliases_strongarm() {
+function wcm_url_aliases_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/README b/profiles/wcm_base/modules/custom/wcm_user_config/README
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_user_config/README
rename to profiles/wcm_base/modules/custom/wcm_user_config/README
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/theme/user-login.tpl.php b/profiles/wcm_base/modules/custom/wcm_user_config/theme/user-login.tpl.php
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_user_config/theme/user-login.tpl.php
rename to profiles/wcm_base/modules/custom/wcm_user_config/theme/user-login.tpl.php
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.ds.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.ds.inc
similarity index 95%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.ds.inc
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.ds.inc
index 457297825e787347c70202c54daed243c8e28c92..8142a94e9bbfe4addee1cfcf5ce3431a50be252c 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.ds.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.ds.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_user_config.ds.inc
+ * wcm_user_config.ds.inc
  */
 
 /**
  * Implements hook_ds_layout_settings_info().
  */
-function ocio_user_config_ds_layout_settings_info() {
+function wcm_user_config_ds_layout_settings_info() {
   $export = array();
 
   $ds_layout = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.features_overrides.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc
similarity index 98%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.features_overrides.inc
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc
index f1135d71cd04093a9d66cef7934a8fdc9a7786cd..687e98a7a08bf82d899abd6d9c391f61b0a1193d 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_user_config.features.features_overrides.inc
+ * wcm_user_config.features.features_overrides.inc
  */
 
 /**
  * Implements hook_features_override_default_overrides().
  */
-function ocio_user_config_features_override_default_overrides() {
+function wcm_user_config_features_override_default_overrides() {
   // This code is only used for UI in features. Exported alters hooks do the magic.
   $overrides = array();
 
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.inc
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc
index 5bad963dd32b7fc795b44d70dd7c089174fda500..4390c872221e514336864cfd0b236d741543d053 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_user_config.features.inc
+ * wcm_user_config.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function ocio_user_config_ctools_plugin_api($module = NULL, $api = NULL) {
+function wcm_user_config_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "ds" && $api == "ds") {
     return array("version" => "1");
   }
@@ -19,7 +19,7 @@ function ocio_user_config_ctools_plugin_api($module = NULL, $api = NULL) {
 /**
  * Implements hook_views_default_views_alter().
  */
-function ocio_user_config_views_default_views_alter(&$data) {
+function wcm_user_config_views_default_views_alter(&$data) {
   if (isset($data['admin_views_user'])) {
     $data['admin_views_user']->display['default']->display_options['fields']['views_bulk_operations']['vbo_operations']['action::role_delegation_delegate_roles_action'] = array(
       'selected' => 1,
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.user_permission.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc
similarity index 98%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.user_permission.inc
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc
index 6739f4ba0271b7eb2399f38792d50dff196916d6..3a7fa19df9ae71e9817f05253f0320ba4568a6d2 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_user_config.features.user_permission.inc
+ * wcm_user_config.features.user_permission.inc
  */
 
 /**
  * Implements hook_user_default_permissions().
  */
-function ocio_user_config_user_default_permissions() {
+function wcm_user_config_user_default_permissions() {
   $permissions = array();
 
   // Exported permission: 'access user profiles'.
@@ -38,7 +38,7 @@ function ocio_user_config_user_default_permissions() {
     'roles' => array(
       'administrator' => 'administrator',
     ),
-    'module' => 'ocio_user_config',
+    'module' => 'wcm_user_config',
   );
 
   // Exported permission: 'administer permissions'.
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.user_role.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_role.inc
similarity index 90%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.user_role.inc
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_role.inc
index e26151a7d9da9866666b4b7c714b990f3e4098ef..1290d6108bd7066c954e7e93944a771e04c9fbe2 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.features.user_role.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_role.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_user_config.features.user_role.inc
+ * wcm_user_config.features.user_role.inc
  */
 
 /**
  * Implements hook_user_default_roles().
  */
-function ocio_user_config_user_default_roles() {
+function wcm_user_config_user_default_roles() {
   $roles = array();
 
   // Exported role: administrator.
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.info b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.info
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.info
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.info
index 00b1ff06de78552fbee076f5347db2054c988fa9..3ff6a8f780e4b22c5c9abd9433e28d9d2b784ecd 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.info
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.info
@@ -1,9 +1,9 @@
-name = OCIO User Config
+name = WCM User Config
 description = User configuration settings.
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_user_config
+project = wcm_user_config
 dependencies[] = administerusersbyrole
 dependencies[] = ctools
 dependencies[] = ds
@@ -76,5 +76,5 @@ features[user_role][] = private content viewer
 features[user_role][] = site builder
 features[user_role][] = site manager
 features[variable][] = views_defaults
-features_exclude[dependencies][ocio_user_config] = ocio_user_config
+features_exclude[dependencies][wcm_user_config] = wcm_user_config
 features_exclude[dependencies][admin_views] = admin_views
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.make b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.make
similarity index 94%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.make
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.make
index ef3daba936f4951d746868c2ed2808852294698b..e10a72b6781bc853a809fc3338ce6aff1f3aad9e 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.make
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.make
@@ -1,4 +1,4 @@
-; OCIO Main Menu Makefile
+; WCM User Config Makefile
 
 api = 2
 core = 7.x
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.module b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.module
similarity index 84%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.module
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.module
index bbe002ca371a343134f867505edb9cc9c87f2fc8..1408b72044d8573ef1d0755e31b1f86c17cbb07c 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.module
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.module
@@ -1,15 +1,15 @@
 <?php
 /**
  * @file
- * Code for the OCIO User Config feature.
+ * Code for the WCM User Config feature.
  */
 
-include_once 'ocio_user_config.features.inc';
+include_once 'wcm_user_config.features.inc';
 
 /**
  * Implements hook_permission().
  */
-function ocio_user_config_permission() {
+function wcm_user_config_permission() {
   return array(
     'administer all users' => array(
       'title' => t('Administer all users'),
@@ -21,7 +21,7 @@ function ocio_user_config_permission() {
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_user_config_form_user_admin_account_alter(&$form, &$form_state) {
+function wcm_user_config_form_user_admin_account_alter(&$form, &$form_state) {
 
   if (!user_access('administer all users')) {
     global $user;
@@ -64,7 +64,7 @@ function ocio_user_config_form_user_admin_account_alter(&$form, &$form_state) {
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_user_config_form_user_filter_form_alter(&$form, &$form_state) {
+function wcm_user_config_form_user_filter_form_alter(&$form, &$form_state) {
   if (!user_access('administer all users')) {
     $form['filters']['status']['filters']['permission']['#access'] = FALSE;
   }
@@ -73,7 +73,7 @@ function ocio_user_config_form_user_filter_form_alter(&$form, &$form_state) {
 /**
  * Implements hook_theme().
  */
-function ocio_user_config_theme($existing, $type, $theme, $path) {
+function wcm_user_config_theme($existing, $type, $theme, $path) {
 
   $items = array();
 
@@ -90,7 +90,7 @@ function ocio_user_config_theme($existing, $type, $theme, $path) {
 /**
  * Implements hook_preprocess_page().
  */
-function ocio_user_config_preprocess_page(&$vars) {
+function wcm_user_config_preprocess_page(&$vars) {
   $path = current_path();
 
   if ($path == 'user' && !user_is_logged_in()) {
diff --git a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.strongarm.inc
similarity index 85%
rename from profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.strongarm.inc
index 909b3fa9890f1bd1ce23cb19f1cf054dd41f4539..cb82a49d7cdff4da38edb75602407a9658856c77 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_config/ocio_user_config.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_user_config.strongarm.inc
+ * wcm_user_config.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_user_config_strongarm() {
+function wcm_user_config_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_uuid_settings/README b/profiles/wcm_base/modules/custom/wcm_uuid_settings/README
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_uuid_settings/README
rename to profiles/wcm_base/modules/custom/wcm_uuid_settings/README
diff --git a/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.features.inc b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.features.inc
new file mode 100644
index 0000000000000000000000000000000000000000..0e36f5f2c9ee6182b544c394b3f15502a5f48a3c
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.features.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file
+ * wcm_uuid_settings.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function wcm_uuid_settings_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "strongarm" && $api == "strongarm") {
+    return array("version" => "1");
+  }
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.info b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.info
similarity index 97%
rename from profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.info
rename to profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.info
index 15a3cb39d76fcc725a67559a4b78e580d7aa82df..583c2569a6a973a86c6190df78d1bafa05029142 100644
--- a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.info
+++ b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.info
@@ -1,9 +1,9 @@
-name = OCIO UUID Settings
+name = WCM UUID Settings
 description = Sitewide settings for UUID modules.
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_uuid_settings
+project = wcm_uuid_settings
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = strongarm
diff --git a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.make b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.make
similarity index 92%
rename from profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.make
rename to profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.make
index 7b5bf64537aa2e7e55bd5d6e75d4538627cf699a..72394c5a0da3870fe476a9bd2918026c0a83752e 100644
--- a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.make
+++ b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.make
@@ -1,4 +1,4 @@
-; OCIO UUID Makefile
+; WCM UUID Makefile
 
 api = 2
 core = 7.x
diff --git a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.module b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.module
similarity index 70%
rename from profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.module
rename to profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.module
index 2fab17b353c0468e8fd9715c237600d48038658f..a9c8603a801cc698254753783b00ba8dc7737a3a 100644
--- a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.module
+++ b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.module
@@ -1,15 +1,15 @@
 <?php
 /**
  * @file
- * Code for the OCIO UUID Settings feature.
+ * Code for the WCM UUID Settings feature.
  */
 
-include_once 'ocio_uuid_settings.features.inc';
+include_once 'wcm_uuid_settings.features.inc';
 
 /*
  * Implements hook_uuid_node_features_export_render_alter().
  */
-function ocio_uuid_settings_uuid_node_features_export_render_alter(&$export, $node, $module) {
+function wcm_uuid_settings_uuid_node_features_export_render_alter(&$export, $node, $module) {
   // don't allow uuid_features to export node properties that can change on deployment.
   unset($export->workbench_moderation);
   unset($export->revision_timestamp);
@@ -28,7 +28,7 @@ function ocio_uuid_settings_uuid_node_features_export_render_alter(&$export, $no
 /*
  * Implements hook_uuid_entity_features_export_render_alter().
  */
-function ocio_uuid_settings_uuid_entity_features_export_render_alter($entity_type, &$export, &$entity, $module) {
+function wcm_uuid_settings_uuid_entity_features_export_render_alter($entity_type, &$export, &$entity, $module) {
   if ($entity_type == 'file') {
     unset($export->user_uuid);
     unset($export->fid);
diff --git a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.strongarm.inc
similarity index 99%
rename from profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.strongarm.inc
rename to profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.strongarm.inc
index 108c450ad72653e99bfa19e8fb07561465e80731..e64e340bdcd2132757d65586ca72583984f119f0 100644
--- a/profiles/wcm_base/modules/custom/ocio_uuid_settings/ocio_uuid_settings.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_uuid_settings/wcm_uuid_settings.strongarm.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_uuid_settings.strongarm.inc
+ * wcm_uuid_settings.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function ocio_uuid_settings_strongarm() {
+function wcm_uuid_settings_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/README b/profiles/wcm_base/modules/custom/wcm_workbench/README
similarity index 100%
rename from profiles/wcm_base/modules/custom/ocio_workbench/README
rename to profiles/wcm_base/modules/custom/wcm_workbench/README
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.features_overrides.inc b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.features_overrides.inc
similarity index 95%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.features_overrides.inc
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.features_overrides.inc
index 22f68bd120662de8ddde892d7dd6c66d142c6eaa..b35b0383063c2bd4624cb79b1ed6552846618c6d 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.features_overrides.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_workbench.features.features_overrides.inc
+ * wcm_workbench.features.features_overrides.inc
  */
 
 /**
  * Implements hook_features_override_default_overrides().
  */
-function ocio_workbench_features_override_default_overrides() {
+function wcm_workbench_features_override_default_overrides() {
   // This code is only used for UI in features. Exported alters hooks do the magic.
   $overrides = array();
 
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.inc b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.inc
similarity index 94%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.inc
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.inc
index befa9ce8571b215e2c4e088d8b83adb1b40e331f..90be2ac2a2e4945ed81478b1ee0b9ac76e5243f1 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.inc
@@ -1,20 +1,20 @@
 <?php
 /**
  * @file
- * ocio_workbench.features.inc
+ * wcm_workbench.features.inc
  */
 
 /**
  * Implements hook_views_api().
  */
-function ocio_workbench_views_api($module = NULL, $api = NULL) {
+function wcm_workbench_views_api($module = NULL, $api = NULL) {
   return array("api" => "3.0");
 }
 
 /**
  * Implements hook_views_default_views_alter().
  */
-function ocio_workbench_views_default_views_alter(&$data) {
+function wcm_workbench_views_default_views_alter(&$data) {
   if (isset($data['workbench_edited'])) {
     $data['workbench_edited']->display['page_1']->display_options['path'] = 'admin/workbench/my/edits'; /* WAS: 'admin/workbench/content/edited' */
   }
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.workbench_moderation_states.inc b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.workbench_moderation_states.inc
similarity index 83%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.workbench_moderation_states.inc
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.workbench_moderation_states.inc
index 13fb263558904b721b63646f37becb23db17f0cc..74147a4bc3d6fa3a79c47b3f3fcfb41276783f1c 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.workbench_moderation_states.inc
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.workbench_moderation_states.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_workbench.features.workbench_moderation_states.inc
+ * wcm_workbench.features.workbench_moderation_states.inc
  */
 
 /**
  * Implements hook_workbench_moderation_export_states().
  */
-function ocio_workbench_workbench_moderation_export_states() {
+function wcm_workbench_workbench_moderation_export_states() {
   $items = array(
     'draft' => array(
       'name' => 'draft',
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.workbench_moderation_transitions.inc b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.workbench_moderation_transitions.inc
similarity index 86%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.workbench_moderation_transitions.inc
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.workbench_moderation_transitions.inc
index b9ea7de4bd408a70a49c123b06c2b32eb1156a23..0eed4ec5aff9ce55a51c253ee878c81b488074b5 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.features.workbench_moderation_transitions.inc
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.features.workbench_moderation_transitions.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_workbench.features.workbench_moderation_transitions.inc
+ * wcm_workbench.features.workbench_moderation_transitions.inc
  */
 
 /**
  * Implements hook_workbench_moderation_export_transitions().
  */
-function ocio_workbench_workbench_moderation_export_transitions() {
+function wcm_workbench_workbench_moderation_export_transitions() {
   $items = array(
     'draft:needs_review' => array(
       'from_name' => 'draft',
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.info b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info
similarity index 98%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.info
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info
index ff6f8b2e1d916c987d80076c783256410e22e080..6024370047a40ccb7fa721af8205739a74caebdf 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.info
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info
@@ -1,9 +1,9 @@
-name = OCIO Workbench
+name = WCM Workbench
 description = Workbench settings and permissions
 core = 7.x
-package = OCIO Configuration
+package = WCM Configuration
 version = 7.x-1.0
-project = ocio_workbench
+project = wcm_workbench
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = views
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.make b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.make
similarity index 96%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.make
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.make
index d941dd050319e75ad978b3926c8ed7d94f9779af..dac91b012629beb77d8b1e0cdcd823eb9b70308b 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.make
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.make
@@ -1,4 +1,4 @@
-; OCIO Workbench Makefile
+; WCM Workbench Makefile
 
 api = 2
 core = 7.x
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.module b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.module
similarity index 74%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.module
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.module
index 3aa1d19a910471b19daf0007deffadea67155486..c3eb8337d1782e049ddf0b7afce77cc969fcdd3b 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.module
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.module
@@ -1,15 +1,15 @@
 <?php
 /**
  * @file
- * Code for the OCIO Workbench feature.
+ * Code for the WCM Workbench feature.
  */
 
-include_once 'ocio_workbench.features.inc';
+include_once 'wcm_workbench.features.inc';
 
 /*
  * Implements hook_menu_alter().
  */
-function ocio_workbench_menu_alter(&$items) {
+function wcm_workbench_menu_alter(&$items) {
   $items['admin/workbench/my'] = $items['admin/workbench/content'];
   unset($items['admin/workbench/content']);
   $items['admin/workbench/create']['weight'] = -200;
@@ -20,7 +20,7 @@ function ocio_workbench_menu_alter(&$items) {
 /*
  * Implements hook_block_info_alter().
  */
-function ocio_workbench_block_info_alter(&$blocks, $theme, $code_blocks) {
+function wcm_workbench_block_info_alter(&$blocks, $theme, $code_blocks) {
   // Move workbench info block to workbench region
   $blocks['workbench']['block']['region'] = 'workbench';
   $blocks['workbench']['block']['status'] = 1;
@@ -29,14 +29,14 @@ function ocio_workbench_block_info_alter(&$blocks, $theme, $code_blocks) {
 /*
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_workbench_form_node_delete_confirm_alter(&$form, &$form_state) {
+function wcm_workbench_form_node_delete_confirm_alter(&$form, &$form_state) {
   $form['description']['#prefix'] = t('You are about to delete the @type %title and all of its revisions.', array('@type' => node_type_get_name($form['#node']), '%title' => $form['#node']->title));
 }
 
 /*
  * Implements hook_form_FORM_ID_alter().
  */
-function ocio_workbench_form_node_revision_delete_confirm_alter(&$form, &$form_state) {
+function wcm_workbench_form_node_revision_delete_confirm_alter(&$form, &$form_state) {
    $form['description']['#prefix'] = t('You are about to delete the revision of %title dated @time.', array('%title' => $form['#node_revision']->title, '@time' => format_date($form['#node_revision']->revision_timestamp)));
 }
 
diff --git a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.views_default.inc b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc
similarity index 99%
rename from profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.views_default.inc
rename to profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc
index 921496ddf993b25555219422ce596cf2190774d2..f6e8632d05a71de71d2f3fda24ce4a355ac98a22 100644
--- a/profiles/wcm_base/modules/custom/ocio_workbench/ocio_workbench.views_default.inc
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ocio_workbench.views_default.inc
+ * wcm_workbench.views_default.inc
  */
 
 /**
  * Implements hook_views_default_views().
  */
-function ocio_workbench_views_default_views() {
+function wcm_workbench_views_default_views() {
   $export = array();
 
   $view = new view();
diff --git a/profiles/wcm_base/wcm_base.info b/profiles/wcm_base/wcm_base.info
index 34248b818e92856b4f700f447d76f7cd575a104d..8780510bf685d34ba71deb4cf7f13b2811a31942 100644
--- a/profiles/wcm_base/wcm_base.info
+++ b/profiles/wcm_base/wcm_base.info
@@ -91,14 +91,14 @@ dependencies[] = uuid
 
 
 ; Custom
-dependencies[] = ocio_accessibility
+dependencies[] = wcm_accessibility
 dependencies[] = ocio_admin_menu
 dependencies[] = ocio_basic_page
 dependencies[] = ocio_book
 dependencies[] = ocio_buckeye_alert
 dependencies[] = ocio_calendar
 dependencies[] = ocio_web_form
-dependencies[] = ocio_ds_settings
+dependencies[] = wcm_ds_settings
 dependencies[] = ocio_faqs
 dependencies[] = ocio_featured_slideshow
 dependencies[] = ocio_field_bases
@@ -108,16 +108,16 @@ dependencies[] = ocio_main_menu
 dependencies[] = ocio_media
 dependencies[] = ocio_news
 dependencies[] = ocio_omega_settings
-dependencies[] = ocio_panels_settings
-dependencies[] = ocio_permissions
-dependencies[] = ocio_search
+dependencies[] = wcm_panels_settings
+dependencies[] = wcm_permissions
+dependencies[] = wcm_search
 dependencies[] = ocio_simplesamlphp_auth
 dependencies[] = ocio_siteinfo
 dependencies[] = ocio_taxonomy
-dependencies[] = ocio_url_aliases
-dependencies[] = ocio_user_config
-dependencies[] = ocio_uuid_settings
-dependencies[] = ocio_workbench
+dependencies[] = wcm_url_aliases
+dependencies[] = wcm_user_config
+dependencies[] = wcm_uuid_settings
+dependencies[] = wcm_workbench
 dependencies[] = ocio_wysiwyg
 dependencies[] = wcm_front_page
 dependencies[] = wcm_media_gallery
diff --git a/profiles/wcm_base/wcm_base.install b/profiles/wcm_base/wcm_base.install
index 44b40b0eb61a80e197c90a0aa47deb1c8bd0509d..fb83a6d5955574d83705181e90c9c4d8815ba1d5 100644
--- a/profiles/wcm_base/wcm_base.install
+++ b/profiles/wcm_base/wcm_base.install
@@ -50,11 +50,11 @@ function _wcm_base_set_up_theme() {
  */
 function _wcm_base_set_up_admin() {
   $features = array(
-    'ocio_panels_settings',
-    'ocio_user_config',
-    'ocio_permissions',
-    'ocio_workbench',
-    'ocio_search',
+    'wcm_panels_settings',
+    'wcm_user_config',
+    'wcm_permissions',
+    'wcm_workbench',
+    'wcm_search',
   );
 
   // Revert custom features to override configuration
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index bcbc2f95663c21fd3b736bdc2fa411fc6fd5e786..66b31e8b8ec5878b083e4c2fe495d7848802a2ef 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -134,11 +134,11 @@ projects[omega][version] = 4.4
 ; **********************************************
 ; ****************** CUSTOM ********************
 
-projects[ocio_accessibility][type] = module
-projects[ocio_accessibility][subdir] = custom
-projects[ocio_accessibility][download][type] = "git"
-projects[ocio_accessibility][download][url] = git@code.osu.edu:ocio_odee_web/ocio_accessibility.git
-projects[ocio_accessibility][download][branch] = 7.x-1.x
+projects[wcm_accessibility][type] = module
+projects[wcm_accessibility][subdir] = custom
+projects[wcm_accessibility][download][type] = "git"
+projects[wcm_accessibility][download][url] = git@code.osu.edu:ocio_odee_web/wcm_accessibility.git
+projects[wcm_accessibility][download][branch] = 7.x-1.x
 
 projects[ocio_admin_menu][type] = module
 projects[ocio_admin_menu][subdir] = custom
@@ -176,11 +176,11 @@ projects[ocio_web_form][download][type] = "git"
 projects[ocio_web_form][download][url] = git@code.osu.edu:ocio_odee_web/ocio_web_form.git
 projects[ocio_web_form][download][branch] = 7.x-1.x
 
-projects[ocio_ds_settings][type] = module
-projects[ocio_ds_settings][subdir] = custom
-projects[ocio_ds_settings][download][type] = "git"
-projects[ocio_ds_settings][download][url] = git@code.osu.edu:ocio_odee_web/ocio_ds_settings.git
-projects[ocio_ds_settings][download][branch] = 7.x-1.x
+projects[wcm_ds_settings][type] = module
+projects[wcm_ds_settings][subdir] = custom
+projects[wcm_ds_settings][download][type] = "git"
+projects[wcm_ds_settings][download][url] = git@code.osu.edu:ocio_odee_web/wcm_ds_settings.git
+projects[wcm_ds_settings][download][branch] = 7.x-1.x
 
 projects[ocio_featured_slideshow][type] = module
 projects[ocio_featured_slideshow][subdir] = custom
@@ -236,23 +236,23 @@ projects[ocio_omega_settings][download][type] = "git"
 projects[ocio_omega_settings][download][url] = git@code.osu.edu:ocio_odee_web/ocio_omega_settings.git
 projects[ocio_omega_settings][download][branch] = 7.x-1.x
 
-projects[ocio_panels_settings][type] = module
-projects[ocio_panels_settings][subdir] = custom
-projects[ocio_panels_settings][download][type] = "git"
-projects[ocio_panels_settings][download][url] = git@code.osu.edu:ocio_odee_web/ocio_panels_settings.git
-projects[ocio_panels_settings][download][branch] = 7.x-1.x
+projects[wcm_panels_settings][type] = module
+projects[wcm_panels_settings][subdir] = custom
+projects[wcm_panels_settings][download][type] = "git"
+projects[wcm_panels_settings][download][url] = git@code.osu.edu:ocio_odee_web/wcm_panels_settings.git
+projects[wcm_panels_settings][download][branch] = 7.x-1.x
 
-projects[ocio_permissions][type] = module
-projects[ocio_permissions][subdir] = custom
-projects[ocio_permissions][download][type] = "git"
-projects[ocio_permissions][download][url] = git@code.osu.edu:ocio_odee_web/ocio_permissions.git
-projects[ocio_permissions][download][branch] = 7.x-1.x
+projects[wcm_permissions][type] = module
+projects[wcm_permissions][subdir] = custom
+projects[wcm_permissions][download][type] = "git"
+projects[wcm_permissions][download][url] = git@code.osu.edu:ocio_odee_web/wcm_permissions.git
+projects[wcm_permissions][download][branch] = 7.x-1.x
 
-projects[ocio_search][type] = module
-projects[ocio_search][subdir] = custom
-projects[ocio_search][download][type] = "git"
-projects[ocio_search][download][url] = git@code.osu.edu:ocio_odee_web/ocio_search.git
-projects[ocio_search][download][branch] = 7.x-1.x
+projects[wcm_search][type] = module
+projects[wcm_search][subdir] = custom
+projects[wcm_search][download][type] = "git"
+projects[wcm_search][download][url] = git@code.osu.edu:ocio_odee_web/wcm_search.git
+projects[wcm_search][download][branch] = 7.x-1.x
 
 projects[ocio_siteinfo][type] = module
 projects[ocio_siteinfo][subdir] = custom
@@ -272,29 +272,29 @@ projects[ocio_taxonomy][download][type] = "git"
 projects[ocio_taxonomy][download][url] = git@code.osu.edu:ocio_odee_web/ocio_taxonomy.git
 projects[ocio_taxonomy][download][branch] = 7.x-1.x
 
-projects[ocio_url_aliases][type] = module
-projects[ocio_url_aliases][subdir] = custom
-projects[ocio_url_aliases][download][type] = "git"
-projects[ocio_url_aliases][download][url] = git@code.osu.edu:ocio_odee_web/ocio_url_aliases.git
-projects[ocio_url_aliases][download][branch] = 7.x-1.x
-
-projects[ocio_user_config][type] = module
-projects[ocio_user_config][subdir] = custom
-projects[ocio_user_config][download][type] = "git"
-projects[ocio_user_config][download][url] = git@code.osu.edu:ocio_odee_web/ocio_user_config.git
-projects[ocio_user_config][download][branch] = 7.x-1.x
-
-projects[ocio_uuid_settings][type] = module
-projects[ocio_uuid_settings][subdir] = custom
-projects[ocio_uuid_settings][download][type] = "git"
-projects[ocio_uuid_settings][download][url] = git@code.osu.edu:ocio_odee_web/ocio_uuid_settings.git
-projects[ocio_uuid_settings][download][branch] = 7.x-1.x
-
-projects[ocio_workbench][type] = module
-projects[ocio_workbench][subdir] = custom
-projects[ocio_workbench][download][type] = "git"
-projects[ocio_workbench][download][url] = git@code.osu.edu:ocio_odee_web/ocio_workbench.git
-projects[ocio_workbench][download][branch] = 7.x-1.x
+projects[wcm_url_aliases][type] = module
+projects[wcm_url_aliases][subdir] = custom
+projects[wcm_url_aliases][download][type] = "git"
+projects[wcm_url_aliases][download][url] = git@code.osu.edu:ocio_odee_web/wcm_url_aliases.git
+projects[wcm_url_aliases][download][branch] = 7.x-1.x
+
+projects[wcm_user_config][type] = module
+projects[wcm_user_config][subdir] = custom
+projects[wcm_user_config][download][type] = "git"
+projects[wcm_user_config][download][url] = git@code.osu.edu:ocio_odee_web/wcm_user_config.git
+projects[wcm_user_config][download][branch] = 7.x-1.x
+
+projects[wcm_uuid_settings][type] = module
+projects[wcm_uuid_settings][subdir] = custom
+projects[wcm_uuid_settings][download][type] = "git"
+projects[wcm_uuid_settings][download][url] = git@code.osu.edu:ocio_odee_web/wcm_uuid_settings.git
+projects[wcm_uuid_settings][download][branch] = 7.x-1.x
+
+projects[wcm_workbench][type] = module
+projects[wcm_workbench][subdir] = custom
+projects[wcm_workbench][download][type] = "git"
+projects[wcm_workbench][download][url] = git@code.osu.edu:ocio_odee_web/wcm_workbench.git
+projects[wcm_workbench][download][branch] = 7.x-1.x
 
 projects[ocio_wysiwyg][type] = module
 projects[ocio_wysiwyg][subdir] = custom