diff --git a/tests/integration/targets/affinity_group/aliases b/tests/integration/targets/affinity_group/aliases
new file mode 100644
index 0000000..2ce8657
--- /dev/null
+++ b/tests/integration/targets/affinity_group/aliases
@@ -0,0 +1,3 @@
+cloud/cs
+cs/group1
+cs/group3
diff --git a/tests/integration/targets/cs_affinitygroup/meta/main.yml b/tests/integration/targets/affinity_group/meta/main.yml
similarity index 100%
rename from tests/integration/targets/cs_affinitygroup/meta/main.yml
rename to tests/integration/targets/affinity_group/meta/main.yml
diff --git a/tests/integration/targets/cs_affinitygroup/tasks/main.yml b/tests/integration/targets/affinity_group/tasks/main.yml
similarity index 51%
rename from tests/integration/targets/cs_affinitygroup/tasks/main.yml
rename to tests/integration/targets/affinity_group/tasks/main.yml
index 994f21a..023a1c7 100644
--- a/tests/integration/targets/cs_affinitygroup/tasks/main.yml
+++ b/tests/integration/targets/affinity_group/tasks/main.yml
@@ -1,26 +1,26 @@
 ---
 - name: setup
-  cs_affinitygroup:
+  ngine_io.cloudstack.affinity_group:
     name: "{{ cs_resource_prefix }}_ag"
     state: absent
   register: ag
 - name: verify setup
   assert:
     that:
-    - ag is successful
+      - ag is successful
 
 - name: test fail if missing name
-  cs_affinitygroup:
+  ngine_io.cloudstack.affinity_group:
   register: ag
   ignore_errors: true
 - name: verify results of fail if missing name
   assert:
     that:
-    - ag is failed
-    - "ag.msg == 'missing required arguments: name'"
+      - ag is failed
+      - "ag.msg == 'missing required arguments: name'"
 
 - name: test fail unknown affinity type
-  cs_affinitygroup:
+  ngine_io.cloudstack.affinity_group:
     name: "{{ cs_resource_prefix }}_ag"
     affinity_type: unexistent affinity type
   register: ag
@@ -28,66 +28,66 @@
 - name: verify test fail unknown affinity type
   assert:
     that:
-    - ag is failed
-    - "ag.msg == 'affinity group type not found: unexistent affinity type'"
+      - ag is failed
+      - "ag.msg == 'affinity group type not found: unexistent affinity type'"
 
 - name: test present affinity group in check mode
-  cs_affinitygroup: name={{ cs_resource_prefix }}_ag
+  ngine_io.cloudstack.affinity_group: name={{ cs_resource_prefix }}_ag
   register: ag
   check_mode: true
 - name: verify results of create affinity group in check mode
   assert:
     that:
-    - ag is successful
-    - ag is changed
+      - ag is successful
+      - ag is changed
 
 - name: test present affinity group
-  cs_affinitygroup: name={{ cs_resource_prefix }}_ag
+  ngine_io.cloudstack.affinity_group: name={{ cs_resource_prefix }}_ag
   register: ag
 - name: verify results of create affinity group
   assert:
     that:
-    - ag is successful
-    - ag is changed
-    - ag.name == "{{ cs_resource_prefix }}_ag"
+      - ag is successful
+      - ag is changed
+      - ag.name == cs_resource_prefix + "_ag"
 
 - name: test present affinity group is idempotence
-  cs_affinitygroup: name={{ cs_resource_prefix }}_ag
+  ngine_io.cloudstack.affinity_group: name={{ cs_resource_prefix }}_ag
   register: ag
 - name: verify results present affinity group is idempotence
   assert:
     that:
-    - ag is successful
-    - ag is not changed
-    - ag.name == "{{ cs_resource_prefix }}_ag"
+      - ag is successful
+      - ag is not changed
+      - ag.name == cs_resource_prefix + "_ag"
 
 - name: test absent affinity group in check mode
-  cs_affinitygroup: name={{ cs_resource_prefix }}_ag state=absent
+  ngine_io.cloudstack.affinity_group: name={{ cs_resource_prefix }}_ag state=absent
   register: ag
   check_mode: true
 - name: verify results of absent affinity group in check mode
   assert:
     that:
-    - ag is successful
-    - ag is changed
-    - ag.name == "{{ cs_resource_prefix }}_ag"
+      - ag is successful
+      - ag is changed
+      - ag.name == cs_resource_prefix + "_ag"
 
 - name: test absent affinity group
-  cs_affinitygroup: name={{ cs_resource_prefix }}_ag state=absent
+  ngine_io.cloudstack.affinity_group: name={{ cs_resource_prefix }}_ag state=absent
   register: ag
 - name: verify results of absent affinity group
   assert:
     that:
-    - ag is successful
-    - ag is changed
-    - ag.name == "{{ cs_resource_prefix }}_ag"
+      - ag is successful
+      - ag is changed
+      - ag.name == cs_resource_prefix + "_ag"
 
 - name: test absent affinity group is idempotence
-  cs_affinitygroup: name={{ cs_resource_prefix }}_ag state=absent
+  ngine_io.cloudstack.affinity_group: name={{ cs_resource_prefix }}_ag state=absent
   register: ag
 - name: verify results of absent affinity group is idempotence
   assert:
     that:
-    - ag is successful
-    - ag is not changed
-    - ag.name is undefined
+      - ag is successful
+      - ag is not changed
+      - ag.name is undefined
diff --git a/tests/integration/targets/cs_affinitygroup/aliases b/tests/integration/targets/cs_affinitygroup/aliases
deleted file mode 100644
index c89c86d..0000000
--- a/tests/integration/targets/cs_affinitygroup/aliases
+++ /dev/null
@@ -1,2 +0,0 @@
-cloud/cs
-shippable/cs/group1