diff --git a/resources/data_container/actions/remove.yml b/resources/data_container/actions/remove.yml
index d3c3149f..84c60ef7 100644
--- a/resources/data_container/actions/remove.yml
+++ b/resources/data_container/actions/remove.yml
@@ -2,5 +2,5 @@
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
-    - shell: docker rm {{ name }}
+    - shell: docker stop {{ resource_name }}
+    - shell: docker rm {{ resource_name }}
diff --git a/resources/data_container/actions/run.yml b/resources/data_container/actions/run.yml
index 9bccb8cf..76832eb4 100644
--- a/resources/data_container/actions/run.yml
+++ b/resources/data_container/actions/run.yml
@@ -2,7 +2,7 @@
   sudo: yes
   tasks:
     - docker:
-       name: {{ name }}
+       name: {{ resource_name }}
        image: {{ image }}
        state: running
        net: host
diff --git a/resources/docker_container/actions/remove.yml b/resources/docker_container/actions/remove.yml
index d3c3149f..84c60ef7 100644
--- a/resources/docker_container/actions/remove.yml
+++ b/resources/docker_container/actions/remove.yml
@@ -2,5 +2,5 @@
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
-    - shell: docker rm {{ name }}
+    - shell: docker stop {{ resource_name }}
+    - shell: docker rm {{ resource_name }}
diff --git a/resources/docker_container/actions/run.yml b/resources/docker_container/actions/run.yml
index d0527737..c422ed11 100644
--- a/resources/docker_container/actions/run.yml
+++ b/resources/docker_container/actions/run.yml
@@ -3,7 +3,7 @@
   sudo: yes
   tasks:
     - docker:
-       name: {{ name }}
+       name: {{ resource_name }}
        image: {{ image }}
        state: running
        net: host
diff --git a/resources/glance_api_service/actions/remove.yml b/resources/glance_api_service/actions/remove.yml
index 36c74c18..41bb9740 100644
--- a/resources/glance_api_service/actions/remove.yml
+++ b/resources/glance_api_service/actions/remove.yml
@@ -3,6 +3,6 @@
   tasks:
     - name: glance api container
       docker:
-        name: {{ name }}
+        name: {{ resource_name }}
         image: {{ image }}
         state: absent
diff --git a/resources/glance_api_service/actions/run.yml b/resources/glance_api_service/actions/run.yml
index 137ba277..95b2e307 100644
--- a/resources/glance_api_service/actions/run.yml
+++ b/resources/glance_api_service/actions/run.yml
@@ -5,7 +5,7 @@
     - docker:
        command: /bin/bash -c "glance-manage db_sync && /usr/bin/glance-api"
        #command: /usr/bin/glance-api
-       name: {{ name }}
+       name: {{ resource_name }}
        image: {{ image }}
        state: running
        expose:
diff --git a/resources/glance_registry_service/actions/remove.yml b/resources/glance_registry_service/actions/remove.yml
index a7c29381..185b1eef 100644
--- a/resources/glance_registry_service/actions/remove.yml
+++ b/resources/glance_registry_service/actions/remove.yml
@@ -3,6 +3,6 @@
   tasks:
     - name: glance registry container
       docker:
-        name: {{ name }}
+        name: {{ resource_name }}
         image: {{ image }}
         state: absent
diff --git a/resources/glance_registry_service/actions/run.yml b/resources/glance_registry_service/actions/run.yml
index 2139641d..ae76d9d2 100644
--- a/resources/glance_registry_service/actions/run.yml
+++ b/resources/glance_registry_service/actions/run.yml
@@ -5,7 +5,7 @@
     - docker:
        #command: /bin/bash -c "glance-manage db_sync && /usr/bin/glance-registry"
        command: /usr/bin/glance-registry
-       name: {{ name }}
+       name: {{ resource_name }}
        image: {{ image }}
        state: running
        net: host
diff --git a/resources/haproxy_service/actions/remove.yml b/resources/haproxy_service/actions/remove.yml
index a686005d..3125c27c 100644
--- a/resources/haproxy_service/actions/remove.yml
+++ b/resources/haproxy_service/actions/remove.yml
@@ -3,6 +3,6 @@
   tasks:
     - name: haproxy container
       docker:
-        name: {{ name }}
+        name: {{ resource_name }}
         image: {{ image }}
         state: absent
diff --git a/resources/haproxy_service/actions/run.yml b/resources/haproxy_service/actions/run.yml
index d0527737..c422ed11 100644
--- a/resources/haproxy_service/actions/run.yml
+++ b/resources/haproxy_service/actions/run.yml
@@ -3,7 +3,7 @@
   sudo: yes
   tasks:
     - docker:
-       name: {{ name }}
+       name: {{ resource_name }}
        image: {{ image }}
        state: running
        net: host
diff --git a/resources/keystone_service/actions/remove.yml b/resources/keystone_service/actions/remove.yml
index ea815de9..3a3599af 100644
--- a/resources/keystone_service/actions/remove.yml
+++ b/resources/keystone_service/actions/remove.yml
@@ -5,5 +5,5 @@
     - name: keystone container
       docker:
         image: {{ image }}
-        name: {{ name }}
+        name: {{ resource_name }}
         state: absent
diff --git a/resources/keystone_service/actions/run.yml b/resources/keystone_service/actions/run.yml
index 484b8312..bfd3703e 100644
--- a/resources/keystone_service/actions/run.yml
+++ b/resources/keystone_service/actions/run.yml
@@ -4,7 +4,7 @@
     - name: keystone container
       docker:
         command: /bin/bash -c "keystone-manage db_sync && /usr/bin/keystone-all"
-        name: {{ name }}
+        name: {{ resource_name }}
         image: {{ image }}
         state: running
         expose:
diff --git a/resources/keystone_service_endpoint/actions/run.yaml b/resources/keystone_service_endpoint/actions/run.yaml
index 2221f819..71ebf614 100644
--- a/resources/keystone_service_endpoint/actions/run.yaml
+++ b/resources/keystone_service_endpoint/actions/run.yaml
@@ -4,7 +4,7 @@
     - name: keystone service and endpoint
       keystone_service:
         token: {{admin_token}}
-        name: {{name}}
+        name: {{resource_name}}
         type: {{type}}
         description: {{description}}
         publicurl: {{publicurl}}
diff --git a/resources/mariadb_service/actions/remove.yml b/resources/mariadb_service/actions/remove.yml
index cb1bc73b..13374f7b 100644
--- a/resources/mariadb_service/actions/remove.yml
+++ b/resources/mariadb_service/actions/remove.yml
@@ -3,6 +3,6 @@
   tasks:
     - name: mariadb container
       docker:
-        name: {{ name }}
+        name: {{ resource_name }}
         image: {{ image }}
         state: absent