diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml
index d0fd424e0d..afec3bcdb2 100644
--- a/playbooks/openshift-apps/fasjson.yml
+++ b/playbooks/openshift-apps/fasjson.yml
@@ -39,11 +39,11 @@
 
   # Setup kerberos delegation
   - role: ipa/servicedelegationtarget
-    name: ipa-http
+    targetname: ipa-http
     members:
     - { host: "{{ ipa_server }}", service: "HTTP" }
   - role: ipa/servicedelegationrule
-    name: fasjson
+    rulename: fasjson
     members:
     - { host: "fasjson{{ env_suffix }}.fedoraproject.org", service: "HTTP" }
     targets:
diff --git a/roles/ipa/servicedelegationrule/tasks/main.yml b/roles/ipa/servicedelegationrule/tasks/main.yml
index 562e772203..df1fd89306 100644
--- a/roles/ipa/servicedelegationrule/tasks/main.yml
+++ b/roles/ipa/servicedelegationrule/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - name: Create servicedelegationrule entry
   delegate_to: "{{ ipa_server }}"
-  command: ipa servicedelegationrule-add {{name}}-delegation
+  command: ipa servicedelegationrule-add {{rulename}}-delegation
   register: add_result
   check_mode: no
   changed_when: "'Added service delegation rule' in add_result.stdout"
@@ -22,7 +22,7 @@
 
 - name: Add servicedelegationrule members
   delegate_to: "{{ ipa_server }}"
-  command: ipa servicedelegationrule-add-member {{name}}-delegation --principals={{item.service}}/{{item.host}}@{{ipa_realm}}
+  command: ipa servicedelegationrule-add-member {{rulename}}-delegation --principals={{item.service}}/{{item.host}}@{{ipa_realm}}
   loop: "{{ members }}"
   register: add_member_result
   check_mode: no
@@ -34,7 +34,7 @@
 
 - name: Add servicedelegationrule targets
   delegate_to: "{{ ipa_server }}"
-  command: ipa servicedelegationrule-add-target {{name}}-delegation --servicedelegationtargets={{item}}-delegation-targets
+  command: ipa servicedelegationrule-add-target {{rulename}}-delegation --servicedelegationtargets={{item}}-delegation-targets
   loop: "{{ targets }}"
   register: add_target_result
   check_mode: no
diff --git a/roles/ipa/servicedelegationtarget/tasks/main.yml b/roles/ipa/servicedelegationtarget/tasks/main.yml
index 53cd1adc2e..6f95436aaf 100644
--- a/roles/ipa/servicedelegationtarget/tasks/main.yml
+++ b/roles/ipa/servicedelegationtarget/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - name: Create servicedelegationtarget entry
   delegate_to: "{{ ipa_server }}"
-  command: ipa servicedelegationtarget-add {{name}}-delegation-targets
+  command: ipa servicedelegationtarget-add {{targetname}}-delegation-targets
   register: add_result
   check_mode: no
   changed_when: "'Added service delegation target' in add_result.stdout"
@@ -22,7 +22,7 @@
 
 - name: Add servicedelegationtarget members
   delegate_to: "{{ ipa_server }}"
-  command: ipa servicedelegationtarget-add-member {{name}}-delegation-targets --principals={{item.service}}/{{item.host}}@{{ipa_realm}}
+  command: ipa servicedelegationtarget-add-member {{targetname}}-delegation-targets --principals={{item.service}}/{{item.host}}@{{ipa_realm}}
   loop: "{{ members }}"
   register: add_member_result
   check_mode: no