diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index aa4816a882..992e851bee 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -28,8 +28,8 @@
                 >
                 <mct-representation key="'create-button'" mct-object="navigatedObject">
                 </mct-representation>
-                <div>
-                    <mct-include key="'searchbar'"
+                <div class='search-holder'>
+                    <mct-include key="'search'"
                                         mct-object="domainObject">
                     </mct-include>
                 </div>
diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css
index f3c5ba6fbf..35c1b1d17e 100644
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -272,25 +272,25 @@ ul.tree {
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 /* line 27, ../sass/search/_search.scss */
-.search-holder .searchbar {
+.search .searchbar {
   width: 100%;
   margin-top: 20px; }
 /* line 32, ../sass/search/_search.scss */
-.search-holder .results {
+.search .results {
   margin-top: 10px; }
   /* line 35, ../sass/search/_search.scss */
-  .search-holder .results .search-result-item {
+  .search .results .search-result-item {
     margin-bottom: 5px;
     background: #005177;
     border-radius: 2px;
     padding-top: 2px;
     padding-bottom: 1px; }
     /* line 42, ../sass/search/_search.scss */
-    .search-holder .results .search-result-item .label {
+    .search .results .search-result-item .label {
       left: 15px;
       margin-left: 6px; }
       /* line 51, ../sass/search/_search.scss */
-      .search-holder .results .search-result-item .label .title-label {
+      .search .results .search-result-item .label .title-label {
         display: inline-block;
         position: absolute;
         width: auto;
@@ -302,7 +302,7 @@ ul.tree {
         text-overflow: ellipsis;
         white-space: nowrap; }
 /* line 70, ../sass/search/_search.scss */
-.search-holder .load-more-button {
+.search .load-more-button {
   margin-top: 5px;
   position: relative;
   left: 25%;
diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index 097b500934..bee4f0fc2f 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-.search-holder {
+.search {
     $iconWidth: 20px;
     $leftMargin: 6px;
     
diff --git a/platform/features/search/bundle.json b/platform/features/search/bundle.json
index c7fe967012..fed5f05e9d 100644
--- a/platform/features/search/bundle.json
+++ b/platform/features/search/bundle.json
@@ -4,13 +4,13 @@
     "extensions": {
         "controllers": [ 
             {
-                "key": "SearchbarController",
-                "implementation": "controllers/SearchbarController.js",
+                "key": "SearchController",
+                "implementation": "controllers/SearchController.js",
                 "depends": [ "$scope", "$timeout", "searchService" ]
             },
             {
-                "key": "SearchbarItemController",
-                "implementation": "controllers/SearchbarItemController.js",
+                "key": "SearchItemController",
+                "implementation": "controllers/SearchItemController.js",
                 "depends": [ "$scope" ]
             },
             {
@@ -21,15 +21,15 @@
         ],
         "templates": [
             {
-                "key": "searchbar",
-                "templateUrl": "templates/searchbar.html",
+                "key": "search",
+                "templateUrl": "templates/search.html",
                 "uses": [ "composition" ]
             }
         ],
         "representations": [
             {
-                "key": "searchbar-item",
-                "templateUrl": "templates/searchbar-item.html",
+                "key": "search-item",
+                "templateUrl": "templates/search-item.html",
                 "uses": [ "composition" ]
             }
         ],
diff --git a/platform/features/search/res/templates/searchbar-item.html b/platform/features/search/res/templates/search-item.html
similarity index 97%
rename from platform/features/search/res/templates/searchbar-item.html
rename to platform/features/search/res/templates/search-item.html
index 9ef432e35a..9640efc19c 100644
--- a/platform/features/search/res/templates/searchbar-item.html
+++ b/platform/features/search/res/templates/search-item.html
@@ -22,7 +22,7 @@
 
 <span ng-controller="ToggleController as toggle">
     <div class="search-result-item"
-         ng-controller="SearchbarItemController as controller">
+         ng-controller="SearchItemController as controller">
         <mct-representation
             key="'label'"
             mct-object="domainObject"
diff --git a/platform/features/search/res/templates/searchbar.html b/platform/features/search/res/templates/search-view.html
similarity index 57%
rename from platform/features/search/res/templates/searchbar.html
rename to platform/features/search/res/templates/search-view.html
index 1c432a6646..b066c2c8f6 100644
--- a/platform/features/search/res/templates/searchbar.html
+++ b/platform/features/search/res/templates/search-view.html
@@ -19,30 +19,39 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span class="search-holder"
-      ng-controller="SearchbarController as controller">
-    <!-- Search bar input -->
+
+<div class="items-holder grid abs"
+     ng-controller="SearchViewController as controller">
+    
+    <!-- Search bar -->
     <div>
-        <input class="searchbar"
-               id="searchbarinput" 
-               type="text" 
+        <div style="height: 30px">Search:</div>
+        <input type="text" 
+               id="searchinput" 
                value=""
-               ng-keyup="controller.search('searchbarinput')" />
+               ng-keyup="controller.search('searchinput')"
+               style="width: 66%"/>
     </div>
     
+    <!-- some spacing -->
+    <div style="height: 30px"></div>
+    
     <!-- Results list -->
-    <div class="results">
-        <mct-representation key="'searchbar-item'"
-                            ng-repeat="result in results"
-                            mct-object="result.object">
+    <div ng-if="controller.areResults()"
+         style="height: 60px">
+        <p>
+            Results:
+        </p>
+        <div ng-if="controller.areMore()">
+            <button ng-click="controller.loadMore()"> 
+                Load more
+            </button>
+        </div>
+    </div>
+    <div>
+        <mct-representation key="'grid-item'"
+                        ng-repeat="result in results"
+                        mct-object="result.object">
         </mct-representation>
     </div>
-    
-    <!-- Load more? --> 
-    <div ng-if="controller.areMore()">
-        <button class="load-more-button btn very-subtle"
-                ng-click="controller.loadMore()"> 
-            Load more
-        </button>
-    </div>
-</span>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/platform/features/search/res/templates/search.html b/platform/features/search/res/templates/search.html
index b6e5d47a27..7201f2d9af 100644
--- a/platform/features/search/res/templates/search.html
+++ b/platform/features/search/res/templates/search.html
@@ -19,39 +19,30 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-
-<div class="items-holder grid abs"
-     ng-controller="SearchController as controller">
-    
-    <!-- Search bar -->
+<span class="search"
+      ng-controller="SearchController as controller">
+    <!-- Search bar input -->
     <div>
-        <div style="height: 30px">Search:</div>
-        <input type="text" 
-               id="searchinput" 
+        <input class="searchbar"
+               id="searchbarinput" 
+               type="text" 
                value=""
-               ng-keyup="controller.search('searchinput')"
-               style="width: 66%"/>
+               ng-keyup="controller.search('searchbarinput')" />
     </div>
     
-    <!-- some spacing -->
-    <div style="height: 30px"></div>
-    
     <!-- Results list -->
-    <div ng-if="controller.areResults()"
-         style="height: 60px">
-        <p>
-            Results:
-        </p>
-        <div ng-if="controller.areMore()">
-            <button ng-click="controller.loadMore()"> 
-                Load more
-            </button>
-        </div>
-    </div>
-    <div>
-        <mct-representation key="'grid-item'"
-                        ng-repeat="result in results"
-                        mct-object="result.object">
+    <div class="results">
+        <mct-representation key="'search-item'"
+                            ng-repeat="result in results"
+                            mct-object="result.object">
         </mct-representation>
     </div>
-</div>
\ No newline at end of file
+    
+    <!-- Load more? --> 
+    <div ng-if="controller.areMore()">
+        <button class="load-more-button btn very-subtle"
+                ng-click="controller.loadMore()"> 
+            Load more
+        </button>
+    </div>
+</span>
\ No newline at end of file
diff --git a/platform/features/search/src/controllers/SearchController.js b/platform/features/search/src/controllers/SearchController.js
index 34104c5aa0..c84ac34143 100644
--- a/platform/features/search/src/controllers/SearchController.js
+++ b/platform/features/search/src/controllers/SearchController.js
@@ -22,7 +22,7 @@
 /*global define*/
 
 /**
- * Module defining SearchController. Created by shale on 07/08/2015.
+ * Module defining SearchController. Created by shale on 07/15/2015.
  */
 define(function () {
     "use strict";
diff --git a/platform/features/search/src/controllers/SearchbarItemController.js b/platform/features/search/src/controllers/SearchItemController.js
similarity index 100%
rename from platform/features/search/src/controllers/SearchbarItemController.js
rename to platform/features/search/src/controllers/SearchItemController.js
diff --git a/platform/features/search/src/controllers/SearchbarController.js b/platform/features/search/src/controllers/SearchViewController.js
similarity index 95%
rename from platform/features/search/src/controllers/SearchbarController.js
rename to platform/features/search/src/controllers/SearchViewController.js
index 5fa81793a5..e4ed78f301 100644
--- a/platform/features/search/src/controllers/SearchbarController.js
+++ b/platform/features/search/src/controllers/SearchViewController.js
@@ -22,7 +22,7 @@
 /*global define*/
 
 /**
- * Module defining SearchbarController. Created by shale on 07/15/2015.
+ * Module defining SearchViewController. Created by shale on 07/08/2015.
  */
 define(function () {
     "use strict";
@@ -30,7 +30,7 @@ define(function () {
     var INITIAL_LOAD_NUMBER = 20,
         LOAD_INCREMENT = 5;
     
-    function SearchbarController($scope, $timeout, searchService) {
+    function SearchViewController($scope, $timeout, searchService) {
         // Starting amount of results to load. Will get increased. 
         var numResults = INITIAL_LOAD_NUMBER;
         
@@ -105,5 +105,5 @@ define(function () {
             }
         };
     }
-    return SearchbarController;
+    return SearchViewController;
 });