diff --git a/install/ui/add.js b/install/ui/add.js
index fd99b02c5..65b7711e2 100644
--- a/install/ui/add.js
+++ b/install/ui/add.js
@@ -23,7 +23,7 @@
 
 /* REQUIRES: ipa.js */
 
-IPA.add_dialog = function (spec) {
+IPA.entity_adder_dialog = function(spec) {
 
     spec = spec || {};
 
@@ -192,7 +192,7 @@ IPA.add_dialog = function (spec) {
     };
 
     // methods that should be invoked by subclasses
-    that.add_dialog_create = that.create;
+    that.entity_adder_dialog_create = that.create;
 
     init();
 
diff --git a/install/ui/association.js b/install/ui/association.js
index ebb6e421f..d3b66132d 100644
--- a/install/ui/association.js
+++ b/install/ui/association.js
@@ -889,7 +889,7 @@ IPA.association_facet = function (spec) {
 
             that.add_button = IPA.action_button({
                 name: 'add',
-                label: IPA.messages.buttons.enroll,
+                label: IPA.messages.buttons.add,
                 icon: 'add-icon',
                 click: function() {
                     if (!that.add_button.hasClass('action-button-disabled')) {
@@ -923,7 +923,7 @@ IPA.association_facet = function (spec) {
             }).appendTo(span);
 
             $('<label/>', {
-                text: IPA.messages.association.direct_enrollment,
+                text: IPA.messages.association.direct_membership,
                 'for': direct_id
             }).appendTo(span);
 
@@ -944,7 +944,7 @@ IPA.association_facet = function (spec) {
             }).appendTo(span);
 
             $('<label/>', {
-                text: IPA.messages.association.indirect_enrollment,
+                text: IPA.messages.association.indirect_membership,
                 'for': indirect_id
             }).appendTo(span);
         }
diff --git a/install/ui/automount.js b/install/ui/automount.js
index 6b740d8e6..2dfb9ddcb 100644
--- a/install/ui/automount.js
+++ b/install/ui/automount.js
@@ -221,10 +221,10 @@ IPA.automount_key_column = function(spec) {
 
 IPA.automountmap_adder_dialog = function(spec) {
 
-    var that = IPA.add_dialog(spec);
+    var that = IPA.entity_adder_dialog(spec);
 
     that.create = function() {
-        that.add_dialog_create();
+        that.entity_adder_dialog_create();
 
         var method_field = that.get_field('method');
         var indirect_section = that.get_section('indirect');
diff --git a/install/ui/dialog.js b/install/ui/dialog.js
index b55cce715..41b35fb42 100644
--- a/install/ui/dialog.js
+++ b/install/ui/dialog.js
@@ -492,7 +492,7 @@ IPA.adder_dialog = function(spec) {
 
         var add_button = that.create_button({
             name: 'add',
-            label: IPA.messages.buttons.enroll,
+            label: IPA.messages.buttons.add,
             click: function() {
                 if (!add_button.is_enabled()) return;
                 that.execute();
diff --git a/install/ui/dns.js b/install/ui/dns.js
index 2b98f0dfe..ddb284d7a 100644
--- a/install/ui/dns.js
+++ b/install/ui/dns.js
@@ -383,10 +383,10 @@ IPA.dnszone_adder_dialog = function(spec) {
 
     spec = spec || {};
 
-    var that = IPA.add_dialog(spec);
+    var that = IPA.entity_adder_dialog(spec);
 
     that.create = function() {
-        that.add_dialog_create();
+        that.entity_adder_dialog_create();
         that.container.addClass('dnszone-adder-dialog');
     };
 
diff --git a/install/ui/entity.js b/install/ui/entity.js
index c82f4a8df..704b5c43b 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -914,7 +914,7 @@ IPA.entity_builder = function(){
     };
 
     that.adder_dialog = function(spec) {
-        spec.factory = spec.factory || IPA.add_dialog;
+        spec.factory = spec.factory || IPA.entity_adder_dialog;
         spec.name = spec.name || 'add';
 
         if (!spec.title) {
diff --git a/install/ui/group.js b/install/ui/group.js
index a63a7800a..8c18c14a2 100644
--- a/install/ui/group.js
+++ b/install/ui/group.js
@@ -140,7 +140,7 @@ IPA.group_adder_dialog = function (spec) {
 
     spec = spec || {};
 
-    var that = IPA.add_dialog(spec);
+    var that = IPA.entity_adder_dialog(spec);
 
     var init = function() {
 
diff --git a/install/ui/host.js b/install/ui/host.js
index 4c0ce6ed0..63f45e043 100644
--- a/install/ui/host.js
+++ b/install/ui/host.js
@@ -267,10 +267,10 @@ IPA.host_adder_dialog = function(spec) {
     spec = spec || {};
     spec.retry = typeof spec.retry !== 'undefined' ? spec.retry : false;
 
-    var that = IPA.add_dialog(spec);
+    var that = IPA.entity_adder_dialog(spec);
 
     that.create = function() {
-        that.add_dialog_create();
+        that.entity_adder_dialog_create();
         that.container.addClass('host-adder-dialog');
     };
 
diff --git a/install/ui/service.js b/install/ui/service.js
index 0ac2b6bec..02b206e19 100644
--- a/install/ui/service.js
+++ b/install/ui/service.js
@@ -79,18 +79,18 @@ IPA.entity_factories.service = function() {
         }).
         standard_association_facets().
         adder_dialog({
-            factory: IPA.service_add_dialog,
+            factory: IPA.service_adder_dialog,
             height: 350
         }).
         build();
 };
 
 
-IPA.service_add_dialog = function(spec) {
+IPA.service_adder_dialog = function(spec) {
 
     spec = spec || {};
 
-    var that = IPA.add_dialog(spec).
+    var that = IPA.entity_adder_dialog(spec).
         field(IPA.widget({
             name: 'krbprincipalname',
             required: false,
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index dfd1fa68a..5ba1ad1f5 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -24,8 +24,8 @@
                             "memberof": "Add ${entity} ${primary_key} into ${other_entity}",
                             "sourcehost": "Add Source ${other_entity} into ${entity} ${primary_key}"
                         },
-                        "direct_enrollment": "Direct Enrollment",
-                        "indirect_enrollment": "Indirect Enrollment",
+                        "direct_membership": "Direct Membership",
+                        "indirect_membership": "Indirect Membership",
                         "no_entries": "No entries.",
                         "paging": "Showing ${start} to ${end} of ${total} entries.",
                         "remove": {
@@ -48,7 +48,6 @@
                         "add_many": "Add Many",
                         "cancel": "Cancel",
                         "close": "Close",
-                        "enroll": "Enroll",
                         "find": "Find",
                         "get": "Get",
                         "issue": "Issue",
@@ -98,8 +97,8 @@
                     },
                     "facet_groups": {
                         "managedby": "${primary_key} is managed by:",
-                        "member": "Entities enrolled in ${primary_key}:",
-                        "memberof": "${primary_key} is a member of these:"
+                        "member": "${primary_key} members:",
+                        "memberof": "${primary_key} is a member of:"
                     },
                     "facets": {
                         "details": "Settings",
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index e613bc444..bd32442bc 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -114,8 +114,8 @@ class i18n_messages(Command):
                 "memberof": _("Add ${entity} ${primary_key} into ${other_entity}"),
                 "sourcehost": _("Add Source ${other_entity} into ${entity} ${primary_key}"),
             },
-            "direct_enrollment": _("Direct Enrollment"),
-            "indirect_enrollment": _("Indirect Enrollment"),
+            "direct_membership": _("Direct Membership"),
+            "indirect_membership": _("Indirect Membership"),
             "no_entries": _("No entries."),
             "paging": _("Showing ${start} to ${end} of ${total} entries."),
             "remove": {
@@ -138,7 +138,6 @@ class i18n_messages(Command):
             "add_many": _("Add Many"),
             "cancel": _("Cancel"),
             "close": _("Close"),
-            "enroll": _("Enroll"),
             "find": _("Find"),
             "get": _("Get"),
             "issue": _("Issue"),
@@ -188,8 +187,8 @@ class i18n_messages(Command):
         },
         "facet_groups": {
             "managedby": _("${primary_key} is managed by:"),
-            "member": _("Entities enrolled in ${primary_key}:"),
-            "memberof": _("${primary_key} is a member of these:"),
+            "member": _("${primary_key} members:"),
+            "memberof": _("${primary_key} is a member of:"),
         },
         "facets": {
             "details": _("Settings"),