diff --git a/iptrunks.yaml b/iptrunks.yaml
index 0cbf67ba5b49cbdb996963f0c31ecd97f66cd74f..84c8b50afb26f1dfcf6a88474b487dd794428cbc 100644
--- a/iptrunks.yaml
+++ b/iptrunks.yaml
@@ -4,4 +4,4 @@
   gather_facts: false
   roles:
     - Juniper.junos
-    - roles/iptrunks
+    - roles/iptrunk
diff --git a/iptrunks_checks.yaml b/iptrunks_checks.yaml
index 9e441b94c217ce06299d382b0a50000a3b4435df..fdfee8d3ae731ac535ba05a86bc53c60ba83f13f 100644
--- a/iptrunks_checks.yaml
+++ b/iptrunks_checks.yaml
@@ -4,4 +4,4 @@
   gather_facts: false
   roles:
     - Juniper.junos
-    - roles/iptrunks_checks
+    - roles/iptrunk_checks
diff --git a/roles/iptrunks/README.md b/roles/iptrunk/README.md
similarity index 100%
rename from roles/iptrunks/README.md
rename to roles/iptrunk/README.md
diff --git a/roles/iptrunks/defaults/main.yml b/roles/iptrunk/defaults/main.yml
similarity index 100%
rename from roles/iptrunks/defaults/main.yml
rename to roles/iptrunk/defaults/main.yml
diff --git a/roles/iptrunks/handlers/main.yml b/roles/iptrunk/handlers/main.yml
similarity index 100%
rename from roles/iptrunks/handlers/main.yml
rename to roles/iptrunk/handlers/main.yml
diff --git a/roles/iptrunks/meta/main.yml b/roles/iptrunk/meta/main.yml
similarity index 100%
rename from roles/iptrunks/meta/main.yml
rename to roles/iptrunk/meta/main.yml
diff --git a/roles/iptrunks/tasks/iptrunks_compile_object.yaml b/roles/iptrunk/tasks/compile_object.yaml
similarity index 100%
rename from roles/iptrunks/tasks/iptrunks_compile_object.yaml
rename to roles/iptrunk/tasks/compile_object.yaml
diff --git a/roles/iptrunks/tasks/iptrunks_deploy_object.yaml b/roles/iptrunk/tasks/deploy_object.yaml
similarity index 100%
rename from roles/iptrunks/tasks/iptrunks_deploy_object.yaml
rename to roles/iptrunk/tasks/deploy_object.yaml
diff --git a/roles/iptrunks/tasks/main.yml b/roles/iptrunk/tasks/main.yml
similarity index 91%
rename from roles/iptrunks/tasks/main.yml
rename to roles/iptrunk/tasks/main.yml
index f4d9309c648b9d23f360f74664bf1000c4685f6d..abe1eccea1b092566176749797e490efcd894b49 100644
--- a/roles/iptrunks/tasks/main.yml
+++ b/roles/iptrunk/tasks/main.yml
@@ -57,17 +57,17 @@
     msg: "{{ opid }}"
 
 - name: Include compiling the template
-  ansible.builtin.include_tasks: iptrunks_compile_object.yaml
+  ansible.builtin.include_tasks: compile_object.yaml
   when: (verb in verbs)
 
 - name: Include the deployment tasks if specified
-  ansible.builtin.include_tasks: iptrunks_deploy_object.yaml
+  ansible.builtin.include_tasks: deploy_object.yaml
   when: verb == "deploy"
 
 - name: Include the removal tasks if specified
-  ansible.builtin.include_tasks: iptrunks_remove_trunk.yaml
+  ansible.builtin.include_tasks: remove_trunk.yaml
   when: verb == "terminate"
 
 - name: Include the modification tasks if specified
-  ansible.builtin.include_tasks: iptrunk_modify_trunk.yaml
+  ansible.builtin.include_tasks: modify_trunk.yaml
   when: verb == "modify"
diff --git a/roles/iptrunks/tasks/iptrunk_modify_trunk.yaml b/roles/iptrunk/tasks/modify_trunk.yaml
similarity index 100%
rename from roles/iptrunks/tasks/iptrunk_modify_trunk.yaml
rename to roles/iptrunk/tasks/modify_trunk.yaml
diff --git a/roles/iptrunks/tasks/iptrunks_remove_trunk.yaml b/roles/iptrunk/tasks/remove_trunk.yaml
similarity index 100%
rename from roles/iptrunks/tasks/iptrunks_remove_trunk.yaml
rename to roles/iptrunk/tasks/remove_trunk.yaml
diff --git a/roles/iptrunks/templates/juniper/isis_interface.j2 b/roles/iptrunk/templates/juniper/isis_interface.j2
similarity index 100%
rename from roles/iptrunks/templates/juniper/isis_interface.j2
rename to roles/iptrunk/templates/juniper/isis_interface.j2
diff --git a/roles/iptrunks/templates/juniper/ldp_interface.j2 b/roles/iptrunk/templates/juniper/ldp_interface.j2
similarity index 100%
rename from roles/iptrunks/templates/juniper/ldp_interface.j2
rename to roles/iptrunk/templates/juniper/ldp_interface.j2
diff --git a/roles/iptrunks/templates/juniper/lldp_interface.j2 b/roles/iptrunk/templates/juniper/lldp_interface.j2
similarity index 100%
rename from roles/iptrunks/templates/juniper/lldp_interface.j2
rename to roles/iptrunk/templates/juniper/lldp_interface.j2
diff --git a/roles/iptrunks/templates/juniper/trunk_deprovision.j2 b/roles/iptrunk/templates/juniper/trunk_deprovision.j2
similarity index 100%
rename from roles/iptrunks/templates/juniper/trunk_deprovision.j2
rename to roles/iptrunk/templates/juniper/trunk_deprovision.j2
diff --git a/roles/iptrunks/templates/juniper/trunk_interface.j2 b/roles/iptrunk/templates/juniper/trunk_interface.j2
similarity index 100%
rename from roles/iptrunks/templates/juniper/trunk_interface.j2
rename to roles/iptrunk/templates/juniper/trunk_interface.j2
diff --git a/roles/iptrunks/templates/nokia/isis_interface.j2 b/roles/iptrunk/templates/nokia/isis_interface.j2
similarity index 100%
rename from roles/iptrunks/templates/nokia/isis_interface.j2
rename to roles/iptrunk/templates/nokia/isis_interface.j2
diff --git a/roles/iptrunks/templates/nokia/trunk_deprovision.j2 b/roles/iptrunk/templates/nokia/trunk_deprovision.j2
similarity index 100%
rename from roles/iptrunks/templates/nokia/trunk_deprovision.j2
rename to roles/iptrunk/templates/nokia/trunk_deprovision.j2
diff --git a/roles/iptrunks/templates/nokia/trunk_interface.j2 b/roles/iptrunk/templates/nokia/trunk_interface.j2
similarity index 100%
rename from roles/iptrunks/templates/nokia/trunk_interface.j2
rename to roles/iptrunk/templates/nokia/trunk_interface.j2
diff --git a/roles/iptrunks/vars/main.yml b/roles/iptrunk/vars/main.yml
similarity index 100%
rename from roles/iptrunks/vars/main.yml
rename to roles/iptrunk/vars/main.yml
diff --git a/roles/iptrunks_checks/README.md b/roles/iptrunk_checks/README.md
similarity index 100%
rename from roles/iptrunks_checks/README.md
rename to roles/iptrunk_checks/README.md
diff --git a/roles/iptrunks_checks/defaults/main.yml b/roles/iptrunk_checks/defaults/main.yml
similarity index 100%
rename from roles/iptrunks_checks/defaults/main.yml
rename to roles/iptrunk_checks/defaults/main.yml
diff --git a/roles/iptrunks_checks/handlers/main.yml b/roles/iptrunk_checks/handlers/main.yml
similarity index 100%
rename from roles/iptrunks_checks/handlers/main.yml
rename to roles/iptrunk_checks/handlers/main.yml
diff --git a/roles/iptrunks_checks/meta/main.yml b/roles/iptrunk_checks/meta/main.yml
similarity index 100%
rename from roles/iptrunks_checks/meta/main.yml
rename to roles/iptrunk_checks/meta/main.yml
diff --git a/roles/iptrunks_checks/tasks/check_isis.yaml b/roles/iptrunk_checks/tasks/check_isis.yaml
similarity index 100%
rename from roles/iptrunks_checks/tasks/check_isis.yaml
rename to roles/iptrunk_checks/tasks/check_isis.yaml
diff --git a/roles/iptrunks_checks/tasks/check_ping.yaml b/roles/iptrunk_checks/tasks/check_ping.yaml
similarity index 100%
rename from roles/iptrunks_checks/tasks/check_ping.yaml
rename to roles/iptrunk_checks/tasks/check_ping.yaml
diff --git a/roles/iptrunks_checks/tasks/main.yml b/roles/iptrunk_checks/tasks/main.yml
similarity index 100%
rename from roles/iptrunks_checks/tasks/main.yml
rename to roles/iptrunk_checks/tasks/main.yml
diff --git a/roles/iptrunks_checks/vars/main.yml b/roles/iptrunk_checks/vars/main.yml
similarity index 100%
rename from roles/iptrunks_checks/vars/main.yml
rename to roles/iptrunk_checks/vars/main.yml
diff --git a/roles/iptrunk_migration/tasks/iptrunk_compile_template.yaml b/roles/iptrunk_migration/tasks/compile_template.yaml
similarity index 100%
rename from roles/iptrunk_migration/tasks/iptrunk_compile_template.yaml
rename to roles/iptrunk_migration/tasks/compile_template.yaml
diff --git a/roles/iptrunk_migration/tasks/iptrunk_deactivate_trunk_side.yaml b/roles/iptrunk_migration/tasks/deactivate_trunk_side.yaml
similarity index 100%
rename from roles/iptrunk_migration/tasks/iptrunk_deactivate_trunk_side.yaml
rename to roles/iptrunk_migration/tasks/deactivate_trunk_side.yaml
diff --git a/roles/iptrunk_migration/tasks/iptrunk_delete_trunk_side.yaml b/roles/iptrunk_migration/tasks/delete_trunk_side.yaml
similarity index 100%
rename from roles/iptrunk_migration/tasks/iptrunk_delete_trunk_side.yaml
rename to roles/iptrunk_migration/tasks/delete_trunk_side.yaml
diff --git a/roles/iptrunk_migration/tasks/iptrunk_deploy_object.yaml b/roles/iptrunk_migration/tasks/deploy_object.yaml
similarity index 100%
rename from roles/iptrunk_migration/tasks/iptrunk_deploy_object.yaml
rename to roles/iptrunk_migration/tasks/deploy_object.yaml
diff --git a/roles/iptrunk_migration/tasks/main.yml b/roles/iptrunk_migration/tasks/main.yml
index 0d40855d573a155aaa42cdd752e02d8efa29888f..c0198abaf2e5a38fd061fc4f240f087a47500a61 100644
--- a/roles/iptrunk_migration/tasks/main.yml
+++ b/roles/iptrunk_migration/tasks/main.yml
@@ -63,25 +63,25 @@
     msg: "{{ opid }}"
 
 - name: Include compiling the template
-  ansible.builtin.include_tasks: iptrunk_compile_template.yaml
+  ansible.builtin.include_tasks: compile_template.yaml
   when: verb == "deactivate" and inventory_hostname == old_node
 
 - name: Include compiling the template
-  ansible.builtin.include_tasks: iptrunk_compile_template.yaml
+  ansible.builtin.include_tasks: compile_template.yaml
   when: verb == "delete" and inventory_hostname == old_node
 
 - name: Include compiling the template
-  ansible.builtin.include_tasks: iptrunk_compile_template.yaml
+  ansible.builtin.include_tasks: compile_template.yaml
   when: verb == "deploy" and inventory_hostname == new_node.router.router_fqdn
 
 - name: Include the modification tasks if specified
-  ansible.builtin.include_tasks: iptrunk_deactivate_trunk_side.yaml
+  ansible.builtin.include_tasks: deactivate_trunk_side.yaml
   when: verb == "deactivate" and inventory_hostname == old_node
 
 - name: Include the removal tasks if specified
-  ansible.builtin.include_tasks: iptrunk_delete_trunk_side.yaml
+  ansible.builtin.include_tasks: delete_trunk_side.yaml
   when: verb == "delete" and inventory_hostname == old_node
 
 - name: Include the deployment tasks if specified
-  ansible.builtin.include_tasks: iptrunk_deploy_object.yaml
+  ansible.builtin.include_tasks: deploy_object.yaml
   when: verb == "deploy" and inventory_hostname == new_node.router.router_fqdn