diff --git a/horizon/static/framework/widgets/table/basic-table.js b/horizon/static/framework/widgets/table/basic-table.js
index 35c0f4ea1b..8d995bd82e 100644
--- a/horizon/static/framework/widgets/table/basic-table.js
+++ b/horizon/static/framework/widgets/table/basic-table.js
@@ -6,14 +6,14 @@
     .constant('horizon.framework.widgets.table.filterPlaceholderText', gettext('Filter'))
     /**
      * @ngdoc directive
-     * @name horizon.framework.widgets.table.directive:searchBar
+     * @name horizon.framework.widgets.table.directive:hzSearchBar
      * @element
      * @param {string} {array} groupClasses Input group classes (optional)
      * @param {string} {array} iconClasses Icon classes (optional)
      * @param {string} {array} inputClasses Search field classes (optional)
      * @param {string} placeholder input field placeholder text (optional)
      * @description
-     * The `searchBar` directive generates a search field that will
+     * The `hzSearchBar` directive generates a search field that will
      * trigger filtering of the associated Smart-Table.
      *
      * groupClasses - classes that should be applied to input group element
@@ -25,12 +25,12 @@
      *
      * @example
      * ```
-     * <search-bar group-classes="input-group-sm"
+     * <hz-search-bar group-classes="input-group-sm"
      *   icon-classes="fa-search" input-classes="..." placeholder="Filter">
-     * </search-bar>
+     * </hz-search-bar>
      * ```
      */
-    .directive('searchBar', ['horizon.framework.widgets.table.filterPlaceholderText',
+    .directive('hzSearchBar', ['horizon.framework.widgets.table.filterPlaceholderText',
       'horizon.framework.widgets.basePath',
       function(FILTER_PLACEHOLDER_TEXT, path) {
         return {
diff --git a/horizon/static/framework/widgets/table/basic-table.spec.js b/horizon/static/framework/widgets/table/basic-table.spec.js
index 378ef2b6be..ede176a293 100644
--- a/horizon/static/framework/widgets/table/basic-table.spec.js
+++ b/horizon/static/framework/widgets/table/basic-table.spec.js
@@ -22,9 +22,9 @@
                      '<thead>' +
                      ' <tr>' +
                      '   <th>' +
-                     '     <search-bar group-classes="input-group-sm" ' +
+                     '     <hz-search-bar group-classes="input-group-sm" ' +
                      '       icon-classes="fa-search">' +
-                     '     </search-bar>' +
+                     '     </hz-search-bar>' +
                      '   </th>' +
                      ' </tr>' +
                      '</thead>' +
diff --git a/horizon/static/framework/widgets/transfer-table/available.html.example b/horizon/static/framework/widgets/transfer-table/available.html.example
index 5ca51b9cf3..265326c126 100644
--- a/horizon/static/framework/widgets/transfer-table/available.html.example
+++ b/horizon/static/framework/widgets/transfer-table/available.html.example
@@ -3,8 +3,8 @@
   <thead>
     <tr>
       <th class="search-header" colspan="10">
-        <search-bar group-classes="input-group-sm" icon-classes="fa-search">
-        </search-bar>
+        <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
+        </hz-search-bar>
       </th>
     </tr>
     <tr>
@@ -85,4 +85,4 @@
       </td>
     </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html b/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html
index cda4213c52..31dc8c2094 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html
+++ b/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html
@@ -18,8 +18,8 @@ limitations under the License.
   <thead>
   <tr ng-show="showSearchBar">
     <th class="search-header" colspan="9">
-      <search-bar group-classes="input-group-sm" icon-classes="fa-search">
-      </search-bar>
+      <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
+      </hz-search-bar>
     </th>
   </tr>
   <tr>
diff --git a/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html b/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html
index 432cefb47e..7ca2f77b40 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html
+++ b/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html
@@ -79,8 +79,8 @@
           <thead>
             <tr>
               <th class="search-header" colspan="7">
-                <search-bar group-classes="input-group-sm" icon-classes="fa-search">
-                </search-bar>
+                <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
+                </hz-search-bar>
               </th>
             </tr>
             <tr>
@@ -127,4 +127,4 @@
     </transfer-table> <!-- End Key Pairs Table -->
 
   </div> <!-- End Content -->
-</div> <!-- End Controller -->
\ No newline at end of file
+</div> <!-- End Controller -->
diff --git a/openstack_dashboard/static/dashboard/launch-instance/network/network.html b/openstack_dashboard/static/dashboard/launch-instance/network/network.html
index c6156e3ce2..433aa8e62b 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/network/network.html
+++ b/openstack_dashboard/static/dashboard/launch-instance/network/network.html
@@ -99,8 +99,8 @@
         <thead>
           <tr>
             <th class="search-header" colspan="8">
-              <search-bar group-classes="input-group-sm" icon-classes="fa-search">
-              </search-bar>
+              <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
+              </hz-search-bar>
             </th>
           </tr>
           <tr>
diff --git a/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html b/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html
index 6aaf9ec447..25df7f97e5 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html
+++ b/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html
@@ -62,9 +62,9 @@
             <thead>
             <tr>
               <th class="search-header" colspan="7">
-                <search-bar group-classes="input-group-sm"
+                <hz-search-bar group-classes="input-group-sm"
                             icon-classes="fa-search">
-                </search-bar>
+                </hz-search-bar>
               </th>
             </tr>
             <tr>
diff --git a/openstack_dashboard/static/dashboard/launch-instance/source/source.html b/openstack_dashboard/static/dashboard/launch-instance/source/source.html
index b096006d5d..0877c66ba3 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/source/source.html
+++ b/openstack_dashboard/static/dashboard/launch-instance/source/source.html
@@ -287,9 +287,9 @@
           <tr>
             <th class="search-header"
                 colspan="{$ ctrl.tableHeadCells.length + 2 $}">
-              <search-bar group-classes="input-group-sm"
+              <hz-search-bar group-classes="input-group-sm"
                           icon-classes="fa-search">
-              </search-bar>
+              </hz-search-bar>
               </th>
             </tr>
             <tr>