27 files changed, 33 insertions, 33 deletions
diff --git a/install/static/Makefile.am b/install/static/Makefile.am
index 5c88d7800..a539eb8bc 100644
--- a/install/static/Makefile.am
+++ b/install/static/Makefile.am
@@ -21,7 +21,7 @@ app_DATA =                              \
 	jquery-ui.css			\
 	certificate.js 			\
 	group.js 			\
-	hbac.js 			\
+	hbacrule.js 			\
 	hbacsvc.js 			\
 	hbacsvcgroup.js 		\
 	host.js 			\
diff --git a/install/static/hbac.js b/install/static/hbacrule.js
index 264b7c5ae..0e6d82ccd 100755
--- a/install/static/hbac.js
+++ b/install/static/hbacrule.js
@@ -20,28 +20,28 @@
 
 /* REQUIRES: ipa.js, details.js, search.js, add.js, entity.js */
 
-function ipa_hbac() {
+function ipa_hbacrule() {
 
     var that = ipa_entity({
-        'name': 'hbac'
+        'name': 'hbacrule'
     });
 
     that.init = function() {
 
-        var dialog = ipa_hbac_add_dialog({
+        var dialog = ipa_hbacrule_add_dialog({
             'name': 'add',
             'title': 'Add New Rule'
         });
         that.add_dialog(dialog);
         dialog.init();
 
-        var facet = ipa_hbac_search_facet({
+        var facet = ipa_hbacrule_search_facet({
             'name': 'search',
             'label': 'Search'
         });
         that.add_facet(facet);
 
-        facet = ipa_hbac_details_facet({
+        facet = ipa_hbacrule_details_facet({
             'name': 'details',
             'label': 'Details'
         });
@@ -53,9 +53,9 @@ function ipa_hbac() {
     return that;
 }
 
-IPA.add_entity(ipa_hbac());
+IPA.add_entity(ipa_hbacrule());
 
-function ipa_hbac_add_dialog(spec) {
+function ipa_hbacrule_add_dialog(spec) {
 
     spec = spec || {};
 
@@ -83,7 +83,7 @@ function ipa_hbac_add_dialog(spec) {
     return that;
 }
 
-function ipa_hbac_search_facet(spec) {
+function ipa_hbacrule_search_facet(spec) {
 
     spec = spec || {};
 
@@ -126,7 +126,7 @@ function ipa_hbac_search_facet(spec) {
     return that;
 }
 
-function ipa_hbac_details_facet(spec) {
+function ipa_hbacrule_details_facet(spec) {
 
     spec = spec || {};
 
@@ -140,11 +140,11 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'general',
                 'label': 'General',
-                'template': 'hbac-details-general.html #contents'
+                'template': 'hbacrule-details-general.html #contents'
             });
 
         } else {
-            section = ipa_hbac_details_general_section({
+            section = ipa_hbacrule_details_general_section({
                 'name': 'general',
                 'label': 'General'
             });
@@ -160,7 +160,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'user',
                 'label': 'Who',
-                'template': 'hbac-details-user.html #contents'
+                'template': 'hbacrule-details-user.html #contents'
             });
 
         } else {
@@ -197,7 +197,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'host',
                 'label': 'Accessing',
-                'template': 'hbac-details-host.html #contents'
+                'template': 'hbacrule-details-host.html #contents'
             });
 
         } else {
@@ -234,7 +234,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'service',
                 'label': 'Via Service',
-                'template': 'hbac-details-service.html #contents'
+                'template': 'hbacrule-details-service.html #contents'
             });
 
         } else {
@@ -271,7 +271,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'sourcehost',
                 'label': 'From',
-                'template': 'hbac-details-sourcehost.html #contents'
+                'template': 'hbacrule-details-sourcehost.html #contents'
             });
 
         } else {
@@ -308,7 +308,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'accesstime',
                 'label': 'When',
-                'template': 'hbac-details-accesstime.html #contents'
+                'template': 'hbacrule-details-accesstime.html #contents'
             });
 
         } else {
@@ -318,7 +318,7 @@ function ipa_hbac_details_facet(spec) {
             });
         }
 
-        section.add_field(ipa_hbac_accesstime_widget({
+        section.add_field(ipa_hbacrule_accesstime_widget({
             'id': 'accesstime',
             'name': 'accesstime', 'label': 'Access Time',
             'text': 'Rule applies when access is being requested at:',
@@ -523,7 +523,7 @@ function ipa_hbac_details_facet(spec) {
             return;
         }
 
-        //alert(JSON.stringify(batch.to_json()));
+        alert(JSON.stringify(batch.to_json()));
 
         batch.execute();
     };
@@ -538,7 +538,7 @@ function ipa_hbac_details_facet(spec) {
     return that;
 }
 
-function ipa_hbac_details_general_section(spec){
+function ipa_hbacrule_details_general_section(spec){
 
     spec = spec || {};
 
@@ -679,7 +679,7 @@ function ipa_hbac_details_general_section(spec){
     return that;
 }
 
-function ipa_hbac_accesstime_widget(spec) {
+function ipa_hbacrule_accesstime_widget(spec) {
 
     spec = spec || {};
 
diff --git a/install/static/index.html b/install/static/index.html
index 9a62470f9..d63bfc106 100644
--- a/install/static/index.html
+++ b/install/static/index.html
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="certificate.js"></script>
     <script type="text/javascript" src="user.js"></script>
     <script type="text/javascript" src="group.js"></script>
-    <script type="text/javascript" src="hbac.js"></script>
+    <script type="text/javascript" src="hbacrule.js"></script>
     <script type="text/javascript" src="hbacsvc.js"></script>
     <script type="text/javascript" src="hbacsvcgroup.js"></script>
     <script type="text/javascript" src="host.js"></script>
diff --git a/install/static/layouts/default/Makefile.am b/install/static/layouts/default/Makefile.am
index ca57a6539..b02c1c504 100644
--- a/install/static/layouts/default/Makefile.am
+++ b/install/static/layouts/default/Makefile.am
@@ -7,12 +7,12 @@ SUBDIRS =  				\
 
 appdir = $(IPA_DATA_DIR)/static/layouts/default
 app_DATA =                              \
-	hbac-details-accesstime.html	\
-	hbac-details-general.html	\
-	hbac-details-host.html		\
-	hbac-details-service.html	\
-	hbac-details-sourcehost.html	\
-	hbac-details-user.html		\
+	hbacrule-details-accesstime.html	\
+	hbacrule-details-general.html	\
+	hbacrule-details-host.html		\
+	hbacrule-details-service.html	\
+	hbacrule-details-sourcehost.html	\
+	hbacrule-details-user.html		\
 	sudorule-details-general.html	\
 	sudorule-group-dialog.html	\
 	sudorule-host-dialog.html	\
diff --git a/install/static/layouts/default/hbac-details-accesstime.html b/install/static/layouts/default/hbacrule-details-accesstime.html
index 8d5e258b3..8d5e258b3 100755
--- a/install/static/layouts/default/hbac-details-accesstime.html
+++ b/install/static/layouts/default/hbacrule-details-accesstime.html
diff --git a/install/static/layouts/default/hbac-details-general.html b/install/static/layouts/default/hbacrule-details-general.html
index 978369090..978369090 100755
--- a/install/static/layouts/default/hbac-details-general.html
+++ b/install/static/layouts/default/hbacrule-details-general.html
diff --git a/install/static/layouts/default/hbac-details-host.html b/install/static/layouts/default/hbacrule-details-host.html
index 1ba386dab..1ba386dab 100755
--- a/install/static/layouts/default/hbac-details-host.html
+++ b/install/static/layouts/default/hbacrule-details-host.html
diff --git a/install/static/layouts/default/hbac-details-service.html b/install/static/layouts/default/hbacrule-details-service.html
index 77e8420d3..77e8420d3 100755
--- a/install/static/layouts/default/hbac-details-service.html
+++ b/install/static/layouts/default/hbacrule-details-service.html
diff --git a/install/static/layouts/default/hbac-details-sourcehost.html b/install/static/layouts/default/hbacrule-details-sourcehost.html
index aae1ef380..aae1ef380 100755
--- a/install/static/layouts/default/hbac-details-sourcehost.html
+++ b/install/static/layouts/default/hbacrule-details-sourcehost.html
diff --git a/install/static/layouts/default/hbac-details-user.html b/install/static/layouts/default/hbacrule-details-user.html
index 1b58848fe..1b58848fe 100755
--- a/install/static/layouts/default/hbac-details-user.html
+++ b/install/static/layouts/default/hbacrule-details-user.html
diff --git a/install/static/test/data/hbac_add.json b/install/static/test/data/hbacrule_add.json
index 2a5d251bf..2a5d251bf 100644
--- a/install/static/test/data/hbac_add.json
+++ b/install/static/test/data/hbacrule_add.json
diff --git a/install/static/test/data/hbac_add_accesstime.json b/install/static/test/data/hbacrule_add_accesstime.json
index 3c631155b..3c631155b 100644
--- a/install/static/test/data/hbac_add_accesstime.json
+++ b/install/static/test/data/hbacrule_add_accesstime.json
diff --git a/install/static/test/data/hbac_add_host.json b/install/static/test/data/hbacrule_add_host.json
index 038d6aea4..038d6aea4 100644
--- a/install/static/test/data/hbac_add_host.json
+++ b/install/static/test/data/hbacrule_add_host.json
diff --git a/install/static/test/data/hbac_add_service.json b/install/static/test/data/hbacrule_add_service.json
index c658fe8b5..c658fe8b5 100644
--- a/install/static/test/data/hbac_add_service.json
+++ b/install/static/test/data/hbacrule_add_service.json
diff --git a/install/static/test/data/hbac_add_sourcehost.json b/install/static/test/data/hbacrule_add_sourcehost.json
index a657207f5..a657207f5 100644
--- a/install/static/test/data/hbac_add_sourcehost.json
+++ b/install/static/test/data/hbacrule_add_sourcehost.json
diff --git a/install/static/test/data/hbac_add_user.json b/install/static/test/data/hbacrule_add_user.json
index 0c4c976e4..0c4c976e4 100644
--- a/install/static/test/data/hbac_add_user.json
+++ b/install/static/test/data/hbacrule_add_user.json
diff --git a/install/static/test/data/hbac_del.json b/install/static/test/data/hbacrule_del.json
index 2197a12c2..2197a12c2 100644
--- a/install/static/test/data/hbac_del.json
+++ b/install/static/test/data/hbacrule_del.json
diff --git a/install/static/test/data/hbac_find.json b/install/static/test/data/hbacrule_find.json
index fd95d9f57..fd95d9f57 100644
--- a/install/static/test/data/hbac_find.json
+++ b/install/static/test/data/hbacrule_find.json
diff --git a/install/static/test/data/hbac_mod.json b/install/static/test/data/hbacrule_mod.json
index ea2b4d1e8..ea2b4d1e8 100644
--- a/install/static/test/data/hbac_mod.json
+++ b/install/static/test/data/hbacrule_mod.json
diff --git a/install/static/test/data/hbac_remove_accesstime.json b/install/static/test/data/hbacrule_remove_accesstime.json
index 3c631155b..3c631155b 100644
--- a/install/static/test/data/hbac_remove_accesstime.json
+++ b/install/static/test/data/hbacrule_remove_accesstime.json
diff --git a/install/static/test/data/hbac_remove_host.json b/install/static/test/data/hbacrule_remove_host.json
index 02f56ecd6..02f56ecd6 100644
--- a/install/static/test/data/hbac_remove_host.json
+++ b/install/static/test/data/hbacrule_remove_host.json
diff --git a/install/static/test/data/hbac_remove_service.json b/install/static/test/data/hbacrule_remove_service.json
index f8b6b51a5..f8b6b51a5 100644
--- a/install/static/test/data/hbac_remove_service.json
+++ b/install/static/test/data/hbacrule_remove_service.json
diff --git a/install/static/test/data/hbac_remove_sourcehost.json b/install/static/test/data/hbacrule_remove_sourcehost.json
index da32f76e0..da32f76e0 100644
--- a/install/static/test/data/hbac_remove_sourcehost.json
+++ b/install/static/test/data/hbacrule_remove_sourcehost.json
diff --git a/install/static/test/data/hbac_remove_user.json b/install/static/test/data/hbacrule_remove_user.json
index f25317e83..f25317e83 100644
--- a/install/static/test/data/hbac_remove_user.json
+++ b/install/static/test/data/hbacrule_remove_user.json
diff --git a/install/static/test/data/hbac_show.json b/install/static/test/data/hbacrule_show.json
index 2c0b64b39..2c0b64b39 100644
--- a/install/static/test/data/hbac_show.json
+++ b/install/static/test/data/hbacrule_show.json
diff --git a/install/static/test/data/ipa_init.json b/install/static/test/data/ipa_init.json
index e399d8081..3b3f2db7d 100644
--- a/install/static/test/data/ipa_init.json
+++ b/install/static/test/data/ipa_init.json
@@ -3132,7 +3132,7 @@
                         ],
                         "uuid_attribute": "ipauniqueid"
                     },
-                    "hbac": {
+                    "hbacrule": {
                         "aciattrs": [
                             "accessruletype",
                             "accesstime",
@@ -3169,7 +3169,7 @@
                             ]
                         },
                         "bindable": false,
-                        "container_dn": "cn=hbac",
+                        "container_dn": "cn=hbacrules",
                         "default_attributes": [
                             "cn",
                             "accessruletype",
@@ -3208,7 +3208,7 @@
                             "remove_user",
                             "show"
                         ],
-                        "name": "hbac",
+                        "name": "hbacrule",
                         "object_class": [
                             "ipaassociation",
                             "ipahbacrule"
@@ -7833,7 +7833,7 @@
                     "container_configs": "cn=configs,cn=policies",
                     "container_dns": "cn=dns",
                     "container_group": "cn=groups,cn=accounts",
-                    "container_hbac": "cn=hbac",
+                    "container_hbacrule": "cn=hbacrules",
                     "container_hbacservice": "cn=hbacservices,cn=accounts",
                     "container_hbacservicegroup": "cn=hbacservicegroups,cn=accounts",
                     "container_host": "cn=computers,cn=accounts",
diff --git a/install/static/webui.js b/install/static/webui.js
index f17db8bc9..964c8cf79 100644
--- a/install/static/webui.js
+++ b/install/static/webui.js
@@ -34,7 +34,7 @@ var admin_tab_set = [
     ]},
     {name:'policy', children:[
         {name:'dnszone', entity:'dnszone'},
-        {name:'hbac', entity:'hbac', children:[
+        {name:'hbacrule', entity:'hbacrule', children:[
             {name:'hbacsvc', entity:'hbacsvc'},
             {name:'hbacsvcgroup', entity:'hbacsvcgroup'}
         ]},