101 files changed, 196 insertions, 196 deletions

diff --git a/test/integration/targets/vyos_banner/vyos_banner/aliases b/test/integration/targets/vyos_banner/aliases
index 539d957..539d957 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/aliases
+++ b/test/integration/targets/vyos_banner/aliases
diff --git a/test/integration/targets/vyos_banner/vyos_banner/defaults/main.yaml b/test/integration/targets/vyos_banner/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/defaults/main.yaml
+++ b/test/integration/targets/vyos_banner/defaults/main.yaml
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tasks/cli.yaml b/test/integration/targets/vyos_banner/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/tasks/cli.yaml
+++ b/test/integration/targets/vyos_banner/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tasks/main.yaml b/test/integration/targets/vyos_banner/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/tasks/main.yaml
+++ b/test/integration/targets/vyos_banner/tasks/main.yaml
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-no-login.yaml b/test/integration/targets/vyos_banner/tests/cli/basic-no-login.yaml
index d513d2e..5efdf8e 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-no-login.yaml
+++ b/test/integration/targets/vyos_banner/tests/cli/basic-no-login.yaml
@@ -3,7 +3,7 @@
     msg: "cli/basic-no-login.yaml on connection={{ ansible_connection }}"
 
 - name: Setup
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: pre-login
     text: |
       Junk pre-login banner
@@ -11,7 +11,7 @@
     state: present
 
 - name: remove pre-login
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: pre-login
     state: absent
   register: result
@@ -25,7 +25,7 @@
       - "'delete system login banner pre-login' in result.commands"
 
 - name: remove pre-login (idempotent)
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: pre-login
     state: absent
   register: result
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-post-login.yaml b/test/integration/targets/vyos_banner/tests/cli/basic-post-login.yaml
index bda84a8..ff6cbad 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-post-login.yaml
+++ b/test/integration/targets/vyos_banner/tests/cli/basic-post-login.yaml
@@ -3,12 +3,12 @@
     msg: "cli/basic-post-login.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove post-login
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: post-login
     state: absent
 
 - name: Set post-login
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: post-login
     text: |
       this is my post-login banner
@@ -27,7 +27,7 @@
       - "'that has a multiline' in result.commands[0]"
 
 - name: Set post-login again (idempotent)
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: post-login
     text: |
       this is my post-login banner
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-pre-login.yaml b/test/integration/targets/vyos_banner/tests/cli/basic-pre-login.yaml
index eb66a73..8489d87 100644
--- a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-pre-login.yaml
+++ b/test/integration/targets/vyos_banner/tests/cli/basic-pre-login.yaml
@@ -3,12 +3,12 @@
     msg: "cli/basic-pre-login.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove pre-login
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: pre-login
     state: absent
 
 - name: Set pre-login
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: pre-login
     text: |
       this is my pre-login banner
@@ -27,7 +27,7 @@
       - "'that has a multiline' in result.commands[0]"
 
 - name: Set pre-login again (idempotent)
-  vyos_banner:
+  vyos.vyos.vyos_banner:
     banner: pre-login
     text: |
       this is my pre-login banner
diff --git a/test/integration/targets/vyos_command/vyos_command/aliases b/test/integration/targets/vyos_command/aliases
index 539d957..539d957 100644
--- a/test/integration/targets/vyos_command/vyos_command/aliases
+++ b/test/integration/targets/vyos_command/aliases
diff --git a/test/integration/targets/vyos_command/vyos_command/defaults/main.yaml b/test/integration/targets/vyos_command/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_command/vyos_command/defaults/main.yaml
+++ b/test/integration/targets/vyos_command/defaults/main.yaml
diff --git a/test/integration/targets/vyos_command/vyos_command/tasks/cli.yaml b/test/integration/targets/vyos_command/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_command/vyos_command/tasks/cli.yaml
+++ b/test/integration/targets/vyos_command/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_command/vyos_command/tasks/main.yaml b/test/integration/targets/vyos_command/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_command/vyos_command/tasks/main.yaml
+++ b/test/integration/targets/vyos_command/tasks/main.yaml
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/bad_operator.yaml b/test/integration/targets/vyos_command/tests/cli/bad_operator.yaml
index 9e9de9f..bf3334f 100644
--- a/test/integration/targets/vyos_command/vyos_command/tests/cli/bad_operator.yaml
+++ b/test/integration/targets/vyos_command/tests/cli/bad_operator.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/bad_operator.yaml on connection={{ ansible_connection }}"
 
 - name: test bad operator
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
       - show interfaces
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/cli_command.yaml b/test/integration/targets/vyos_command/tests/cli/cli_command.yaml
index caeb202..caeb202 100644
--- a/test/integration/targets/vyos_command/vyos_command/tests/cli/cli_command.yaml
+++ b/test/integration/targets/vyos_command/tests/cli/cli_command.yaml
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/contains.yaml b/test/integration/targets/vyos_command/tests/cli/contains.yaml
index 85c6e86..b8665fa 100644
--- a/test/integration/targets/vyos_command/vyos_command/tests/cli/contains.yaml
+++ b/test/integration/targets/vyos_command/tests/cli/contains.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/contains.yaml on connection={{ ansible_connection }}"
 
 - name: test contains operator
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
       - show interface
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/invalid.yaml b/test/integration/targets/vyos_command/tests/cli/invalid.yaml
index e6d25e4..672f6e8 100644
--- a/test/integration/targets/vyos_command/vyos_command/tests/cli/invalid.yaml
+++ b/test/integration/targets/vyos_command/tests/cli/invalid.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/invalid.yaml on connection={{ ansible_connection }}"
 
 - name: run invalid command
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands: show foo
   register: result
   ignore_errors: yes
@@ -10,7 +10,7 @@
 - assert: { that: result.failed }
 
 - name: run commands that include invalid command
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
       - show foo
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/output.yaml b/test/integration/targets/vyos_command/tests/cli/output.yaml
index 294f62f..bdc8b2a 100644
--- a/test/integration/targets/vyos_command/vyos_command/tests/cli/output.yaml
+++ b/test/integration/targets/vyos_command/tests/cli/output.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/output.yaml on connection={{ ansible_connection }}"
 
 - name: get output for single command
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands: show version
   register: result
 
@@ -13,7 +13,7 @@
       - result.stdout_lines is defined
 
 - name: get output for multiple commands
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
       - show interfaces
@@ -26,7 +26,7 @@
       - result.stdout | length == 2
 
 - name: Get output for multiple commands that call less explicitly
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
         # NOTE: We only test show commands that will output <ANSIBLE_VYOS_TERMINAL_LENGTH
         # Otherwise you will get ": "command timeout triggered"
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/timeout.yaml b/test/integration/targets/vyos_command/tests/cli/timeout.yaml
index 4994ebf..e4716ed 100644
--- a/test/integration/targets/vyos_command/vyos_command/tests/cli/timeout.yaml
+++ b/test/integration/targets/vyos_command/tests/cli/timeout.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/timeout.yaml on connection={{ ansible_connection }}"
 
 - name: test bad condition
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
     wait_for:
diff --git a/test/integration/targets/vyos_config/vyos_config/aliases b/test/integration/targets/vyos_config/aliases
index 539d957..539d957 100644
--- a/test/integration/targets/vyos_config/vyos_config/aliases
+++ b/test/integration/targets/vyos_config/aliases
diff --git a/test/integration/targets/vyos_config/vyos_config/defaults/main.yaml b/test/integration/targets/vyos_config/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_config/vyos_config/defaults/main.yaml
+++ b/test/integration/targets/vyos_config/defaults/main.yaml
diff --git a/test/integration/targets/vyos_config/vyos_config/tasks/cli.yaml b/test/integration/targets/vyos_config/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_config/vyos_config/tasks/cli.yaml
+++ b/test/integration/targets/vyos_config/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_config/vyos_config/tasks/cli_config.yaml b/test/integration/targets/vyos_config/tasks/cli_config.yaml
index f5d5b55..f5d5b55 100644
--- a/test/integration/targets/vyos_config/vyos_config/tasks/cli_config.yaml
+++ b/test/integration/targets/vyos_config/tasks/cli_config.yaml
diff --git a/test/integration/targets/vyos_config/vyos_config/tasks/main.yaml b/test/integration/targets/vyos_config/tasks/main.yaml
index 5e327e8..5e327e8 100644
--- a/test/integration/targets/vyos_config/vyos_config/tasks/main.yaml
+++ b/test/integration/targets/vyos_config/tasks/main.yaml
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/backup.yaml b/test/integration/targets/vyos_config/tests/cli/backup.yaml
index 9f57c44..0ef0986 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli/backup.yaml
+++ b/test/integration/targets/vyos_config/tests/cli/backup.yaml
@@ -15,7 +15,7 @@
   with_items: "{{backup_files.files|default([])}}"
 
 - name: take configure backup
-  vyos_config:
+  vyos.vyos.vyos_config:
     backup: yes
   register: result
 
@@ -43,7 +43,7 @@
     - "{{ role_path }}/backup/backup.cfg"
 
 - name: take configuration backup in custom filename and directory path
-  vyos_config:
+  vyos.vyos.vyos_config:
     backup: yes
     backup_options:
       filename: backup.cfg
@@ -66,7 +66,7 @@
       - "backup_file.files is defined"
 
 - name: take configuration backup in custom filename
-  vyos_config:
+  vyos.vyos.vyos_config:
     backup: yes
     backup_options:
       filename: backup.cfg
@@ -88,7 +88,7 @@
       - "backup_file.files is defined"
 
 - name: take configuration backup in custom path and default filename
-  vyos_config:
+  vyos.vyos.vyos_config:
     backup: yes
     backup_options:
       dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/check_config.yaml b/test/integration/targets/vyos_config/tests/cli/check_config.yaml
index 65076b3..b90ec7b 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli/check_config.yaml
+++ b/test/integration/targets/vyos_config/tests/cli/check_config.yaml
@@ -2,11 +2,11 @@
 - debug: msg="START cli/config_check.yaml on connection={{ ansible_connection }}"
 
 - name: setup- ensure interface is not present
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete interfaces loopback lo
 
 - name: setup- create interface
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - interfaces
       - interfaces loopback lo
@@ -30,7 +30,7 @@
       - "result.commands[0] == 'set interfaces loopback lo description test'"
 
 - name: configure config_check config command
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete interfaces loopback lo
   register: result
 
@@ -39,7 +39,7 @@
       - "result.changed == true"
 
 - name: check config_check config command idempontent
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete interfaces loopback lo
   register: result
 
@@ -48,7 +48,7 @@
       - "result.changed == false"
 
 - name: check multiple line config filter is working
-  vyos_config:
+  vyos.vyos.vyos_config:
       lines:
           - set system login user esa level admin
           - set system login user esa authentication encrypted-password '!abc!'
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/comment.yaml b/test/integration/targets/vyos_config/tests/cli/comment.yaml
index 3c71dfc..2cd1350 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli/comment.yaml
+++ b/test/integration/targets/vyos_config/tests/cli/comment.yaml
@@ -2,12 +2,12 @@
 - debug: msg="START cli/comment.yaml on connection={{ ansible_connection }}"
 
 - name: setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
 
 - name: configure using comment
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name foo
     comment: this is a test
   register: result
@@ -18,7 +18,7 @@
       - "'set system host-name foo' in result.commands"
 
 - name: collect system commits
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands: show system commit
   register: result
 
@@ -27,7 +27,7 @@
       - "'this is a test' in result.stdout_lines[0][1]"
 
 - name: teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
 
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/save.yaml b/test/integration/targets/vyos_config/tests/cli/save.yaml
index 7b058a7..d8e45e2 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli/save.yaml
+++ b/test/integration/targets/vyos_config/tests/cli/save.yaml
@@ -2,12 +2,12 @@
 - debug: msg="START cli/save.yaml on connection={{ ansible_connection }}"
 
 - name: setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
 
 - name: configure hostaname and save
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name foo
     save: true
   register: result
@@ -18,7 +18,7 @@
       - "'set system host-name foo' in result.commands"
 
 - name: configure hostaname and don't save
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name bar
   register: result
 
@@ -28,7 +28,7 @@
       - "'set system host-name bar' in result.commands"
 
 - name: save config
-  vyos_config:
+  vyos.vyos.vyos_config:
     save: true
   register: result
 
@@ -37,7 +37,7 @@
       - "result.changed == true"
 
 - name: save config again
-  vyos_config:
+  vyos.vyos.vyos_config:
     save: true
   register: result
 
@@ -46,7 +46,7 @@
       - "result.changed == false"
 
 - name: teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
     save: true
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/simple.yaml b/test/integration/targets/vyos_config/tests/cli/simple.yaml
index a4a8799..af211f5 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli/simple.yaml
+++ b/test/integration/targets/vyos_config/tests/cli/simple.yaml
@@ -2,12 +2,12 @@
 - debug: msg="START cli/simple.yaml on connection={{ ansible_connection }}"
 
 - name: setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
 
 - name: configure simple config command
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name foo
   register: result
 
@@ -17,7 +17,7 @@
       - "'set system host-name foo' in result.commands"
 
 - name: check simple config command idempontent
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name foo
   register: result
 
@@ -26,7 +26,7 @@
       - "result.changed == false"
 
 - name: teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
 
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_backup.yaml b/test/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
index a431c01..a431c01 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_backup.yaml
+++ b/test/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_basic.yaml b/test/integration/targets/vyos_config/tests/cli_config/cli_basic.yaml
index e83db1e..e83db1e 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_basic.yaml
+++ b/test/integration/targets/vyos_config/tests/cli_config/cli_basic.yaml
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_comment.yaml b/test/integration/targets/vyos_config/tests/cli_config/cli_comment.yaml
index 163f05e..4f9a048 100644
--- a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_comment.yaml
+++ b/test/integration/targets/vyos_config/tests/cli_config/cli_comment.yaml
@@ -16,7 +16,7 @@
       - "result.changed == true"
 
 - name: collect system commits
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands: show system commit
   register: result
 
diff --git a/test/integration/targets/vyos_facts/vyos_facts/aliases b/test/integration/targets/vyos_facts/aliases
index 539d957..539d957 100644
--- a/test/integration/targets/vyos_facts/vyos_facts/aliases
+++ b/test/integration/targets/vyos_facts/aliases
diff --git a/test/integration/targets/vyos_facts/vyos_facts/defaults/main.yaml b/test/integration/targets/vyos_facts/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_facts/vyos_facts/defaults/main.yaml
+++ b/test/integration/targets/vyos_facts/defaults/main.yaml
diff --git a/test/integration/targets/vyos_facts/vyos_facts/tasks/cli.yaml b/test/integration/targets/vyos_facts/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_facts/vyos_facts/tasks/cli.yaml
+++ b/test/integration/targets/vyos_facts/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_facts/vyos_facts/tasks/main.yaml b/test/integration/targets/vyos_facts/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_facts/vyos_facts/tasks/main.yaml
+++ b/test/integration/targets/vyos_facts/tasks/main.yaml
diff --git a/test/integration/targets/vyos_facts/vyos_facts/tests/cli/basic_facts.yaml b/test/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
index 16850cb..e0a3bca 100644
--- a/test/integration/targets/vyos_facts/vyos_facts/tests/cli/basic_facts.yaml
+++ b/test/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
@@ -1,17 +1,17 @@
 - name: get host name
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show host name
   register: vyos_host
 
 - name: get version info
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
   register: vyos_version
 
 - name: collect all facts from the device
-  vyos_facts:
+  vyos.vyos.vyos_facts:
     gather_subset: all
   register: result
 
diff --git a/test/integration/targets/vyos_interface/vyos_interface/aliases b/test/integration/targets/vyos_interface/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/aliases
+++ b/test/integration/targets/vyos_interface/aliases
diff --git a/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml b/test/integration/targets/vyos_interface/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml
+++ b/test/integration/targets/vyos_interface/defaults/main.yaml
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml b/test/integration/targets/vyos_interface/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml
+++ b/test/integration/targets/vyos_interface/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml b/test/integration/targets/vyos_interface/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml
+++ b/test/integration/targets/vyos_interface/tasks/main.yaml
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_interface/tests/cli/basic.yaml
index 2b9ce12..22957e1 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_interface/tests/cli/basic.yaml
@@ -2,18 +2,18 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Run vyos lsmod command
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - lsmod
   register: lsmod_out
 
 - name: Set up - delete interface
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: absent
 
 - name: Set up - Create interface
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface
@@ -26,7 +26,7 @@
       - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands'
 
 - name: Configure interface params
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface-1
@@ -46,7 +46,7 @@
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Configure interface params (idempotent)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface-1
@@ -62,7 +62,7 @@
   when: "'virtio' not in lsmod_out.stdout[0]"
 
 - name: Change interface params
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface-2
@@ -82,7 +82,7 @@
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Disable interface
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: False
   register: result
@@ -93,7 +93,7 @@
       - '"set interfaces ethernet eth1 disable" in result.commands'
 
 - name: Enable interface
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: True
   register: result
@@ -104,7 +104,7 @@
       - '"delete interfaces ethernet eth1 disable" in result.commands'
 
 - name: Delete interface
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: absent
   register: result
@@ -115,7 +115,7 @@
       - '"delete interfaces ethernet eth1" in result.commands'
 
 - name: Delete interface (idempotent)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: absent
   register: result
@@ -125,13 +125,13 @@
       - 'result.changed == false'
 
 - name: Aggregate setup- delete interface
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth2
     state: absent
   register: result
 
 - name: Set interface on aggregate
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
       - { name: eth1, description: test-interface-1,  speed: 100, duplex: half, mtu: 512}
       - { name: eth2, description: test-interface-2,  speed: 1000, duplex: full, mtu: 256}
@@ -152,7 +152,7 @@
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Set interface on aggregate (idempotent)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
       - { name: eth1, description: test-interface-1,  speed: 100, duplex: half, mtu: 512}
       - { name: eth2, description: test-interface-2,  speed: 1000, duplex: full, mtu: 256}
@@ -165,7 +165,7 @@
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Disable interface on aggregate
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
@@ -180,7 +180,7 @@
       - '"set interfaces ethernet eth2 disable" in result.commands'
 
 - name: Enable interface on aggregate
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
@@ -194,7 +194,7 @@
       - '"delete interfaces ethernet eth2 disable" in result.commands'
 
 - name: Delete interface aggregate
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
@@ -208,7 +208,7 @@
       - '"delete interfaces ethernet eth2" in result.commands'
 
 - name: Delete interface aggregate (idempotent)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml b/test/integration/targets/vyos_interface/tests/cli/intent.yaml
index 008dd56..946728d 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml
+++ b/test/integration/targets/vyos_interface/tests/cli/intent.yaml
@@ -7,7 +7,7 @@
 # https://github.com/ansible/ansible/issues/39667
 
 - name: Detect if we have existing lldp neighbors configured
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show lldp neighbors detail
   register: neighbors_out
@@ -17,25 +17,25 @@
     run_lldp_tests: "'PortDescr:    eth0' in neighbors_out.stdout[0]"
 
 - name: Enable LLDP service
-  vyos_lldp:
+  vyos.vyos.vyos_lldp:
     state: present
   when: run_lldp_tests
 
 - name: Create LLDP configuration
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
   when: run_lldp_tests
 
 - name: Setup (interface is up)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: True
     state: present
   register: result
 
 - name: Check intent arguments
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: up
   register: result
@@ -45,7 +45,7 @@
       - "result.failed == false"
 
 - name: Check lldp neighbors intent arguments
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth0
     neighbors:
     - port: eth0
@@ -58,7 +58,7 @@
   when: run_lldp_tests
 
 - name: Check intent arguments (failed condition)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: down
   ignore_errors: yes
@@ -70,7 +70,7 @@
       - "'state eq(down)' in result.failed_conditions"
 
 - name: Check lldp neighbors intent arguments (failed)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth0
     neighbors:
     - port: dummy_port
@@ -87,7 +87,7 @@
   when: run_lldp_tests
 
 - name: Config + intent
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: False
     state: down
@@ -98,7 +98,7 @@
       - "result.failed == false"
 
 - name: Config + intent (fail)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: False
     state: up
@@ -111,7 +111,7 @@
       - "'state eq(up)' in result.failed_conditions"
 
 - name: Aggregate config + intent (pass)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
     - name: eth1
       enabled: True
@@ -124,7 +124,7 @@
       - "result.failed == false"
 
 - name: Check lldp neighbors intent aggregate arguments
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
     - name: eth0
       neighbors:
@@ -138,7 +138,7 @@
   when: run_lldp_tests
 
 - name: Check lldp neighbors intent aggregate arguments (failed)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     aggregate:
     - name: eth0
       neighbors:
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml b/test/integration/targets/vyos_interface/tests/cli/net_interface.yaml
index ced273d..4bdb6ec 100644
--- a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml
+++ b/test/integration/targets/vyos_interface/tests/cli/net_interface.yaml
@@ -5,7 +5,7 @@
 # implementation module and module run is successful.
 
 - name: Run vyos lsmod command
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - lsmod
   register: lsmod_out
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/aliases b/test/integration/targets/vyos_l3_interface/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/aliases
+++ b/test/integration/targets/vyos_l3_interface/aliases
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/defaults/main.yaml b/test/integration/targets/vyos_l3_interface/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/defaults/main.yaml
+++ b/test/integration/targets/vyos_l3_interface/defaults/main.yaml
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/cli.yaml b/test/integration/targets/vyos_l3_interface/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/cli.yaml
+++ b/test/integration/targets/vyos_l3_interface/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/main.yaml b/test/integration/targets/vyos_l3_interface/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/main.yaml
+++ b/test/integration/targets/vyos_l3_interface/tasks/main.yaml
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
index 73feadc..9ad6955 100644
--- a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
@@ -2,17 +2,17 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Remove IP address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     state: absent
 
 - name: Remove IP address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth2
     state: absent
 
 - name: Set IPv4 address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
   register: result
@@ -23,7 +23,7 @@
       - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
 
 - name: Set IPv4 address (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
   register: result
@@ -33,7 +33,7 @@
       - 'result.changed == false'
 
 - name: Set IPv6 address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
   register: result
@@ -44,7 +44,7 @@
       - '"set interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
 
 - name: Set IPv6 address (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
   register: result
@@ -54,7 +54,7 @@
       - 'result.changed == false'
 
 - name: Remove all IP addresses
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     state: absent
   register: result
@@ -65,7 +65,7 @@
       - '"delete interfaces ethernet eth1 address" in result.commands'
 
 - name: Remove all IP addresses again (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     state: absent
   register: result
@@ -75,7 +75,7 @@
       - 'result.changed == false'
 
 - name: Set IPv4 and IPv6 address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     ipv6: fd5d:12c9:2201:1::1/64
@@ -88,7 +88,7 @@
       - '"set interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
 
 - name: Set IPv4 and IPv6 address again (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     ipv6: fd5d:12c9:2201:1::1/64
@@ -99,7 +99,7 @@
       - 'result.changed == false'
 
 - name: Remove IPv4 address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     state: absent
@@ -111,7 +111,7 @@
       - '"delete interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
 
 - name: Remove IPv4 address again (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     state: absent
@@ -122,7 +122,7 @@
       - 'result.changed == false'
 
 - name: Remove IPv6 address
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
     state: absent
@@ -134,7 +134,7 @@
       - '"delete interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
 
 - name: Remove IPv6 address again (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
     state: absent
@@ -145,7 +145,7 @@
       - 'result.changed == false'
 
 - name: Set IP addresses on aggregate
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     aggregate:
       - { name: eth1, ipv4: 192.168.2.10/24 }
       - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
@@ -161,7 +161,7 @@
       - '"set interfaces ethernet eth2 address 192.168.4.10/24" in result.commands'
 
 - name: Set IP addresses on aggregate (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     aggregate:
       - { name: eth1, ipv4: 192.168.2.10/24 }
       - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
@@ -173,7 +173,7 @@
       - 'result.changed == false'
 
 - name: Remove IP addresses on aggregate
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     aggregate:
       - { name: eth1, ipv4: 192.168.2.10/24 }
       - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
@@ -190,7 +190,7 @@
       - '"delete interfaces ethernet eth2 address 192.168.4.10/24" in result.commands'
 
 - name: Remove IP addresses on aggregate (idempotent)
-  vyos_l3_interface:
+  vyos.vyos.vyos_l3_interface:
     aggregate:
       - { name: eth1, ipv4: 192.168.2.10/24 }
       - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/aliases b/test/integration/targets/vyos_linkagg/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_linkagg/vyos_linkagg/aliases
+++ b/test/integration/targets/vyos_linkagg/aliases
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/defaults/main.yaml b/test/integration/targets/vyos_linkagg/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_linkagg/vyos_linkagg/defaults/main.yaml
+++ b/test/integration/targets/vyos_linkagg/defaults/main.yaml
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/cli.yaml b/test/integration/targets/vyos_linkagg/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/cli.yaml
+++ b/test/integration/targets/vyos_linkagg/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/main.yaml b/test/integration/targets/vyos_linkagg/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/main.yaml
+++ b/test/integration/targets/vyos_linkagg/tasks/main.yaml
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/basic.yaml b/test/integration/targets/vyos_linkagg/tests/cli/basic.yaml
index 1a171a7..5a02255 100644
--- a/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_linkagg/tests/cli/basic.yaml
@@ -2,17 +2,17 @@
 - debug: msg="cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Remove linkagg
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: absent
 
 - name: Remove linkagg
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond1
     state: absent
 
 - name: Create linkagg
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth1
@@ -26,7 +26,7 @@
       - '"set interfaces ethernet eth1 bond-group bond0" in result.commands'
 
 - name: Create linkagg again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth1
@@ -38,7 +38,7 @@
       - 'result.changed == false'
 
 - name: Add linkagg member
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth2
@@ -51,7 +51,7 @@
       - '"set interfaces ethernet eth2 bond-group bond0" in result.commands'
 
 - name: Add linkagg member again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth2
@@ -63,7 +63,7 @@
       - 'result.changed == false'
 
 - name: Disable linkagg
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: down
   register: result
@@ -74,7 +74,7 @@
       - '"set interfaces bonding bond0 disable" in result.commands'
 
 - name: Disable linkagg again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: down
   register: result
@@ -84,7 +84,7 @@
       - 'result.changed == false'
 
 - name: Enable linkagg
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: up
   register: result
@@ -95,7 +95,7 @@
       - '"delete interfaces bonding bond0 disable" in result.commands[0]'
 
 - name: Enable linkagg again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: up
   register: result
@@ -105,7 +105,7 @@
       - 'result.changed == false'
 
 - name: Remove linkagg
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: absent
   register: result
@@ -118,7 +118,7 @@
       - '"delete interfaces bonding bond0" in result.commands'
 
 - name: Remove linkagg again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     name: bond0
     state: absent
   register: result
@@ -128,7 +128,7 @@
       - 'result.changed == false'
 
 - name: Create collection of linkagg definitions
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     aggregate:
         - { name: bond0, members: [eth1] }
         - { name: bond1, members: [eth2] }
@@ -144,7 +144,7 @@
       - '"set interfaces ethernet eth2 bond-group bond1" in result.commands'
 
 - name: Create collection of linkagg definitions again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     aggregate:
         - { name: bond0, members: [eth1] }
         - { name: bond1, members: [eth2] }
@@ -156,7 +156,7 @@
       - 'result.changed == false'
 
 - name: Remove collection of linkagg definitions
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     aggregate:
       - name: bond0
       - name: bond1
@@ -172,7 +172,7 @@
       - '"delete interfaces bonding bond1" in result.commands'
 
 - name: Remove collection of linkagg definitions again (idempotent)
-  vyos_linkagg:
+  vyos.vyos.vyos_linkagg:
     aggregate:
       - name: bond0
       - name: bond1
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/net_linkagg.yaml b/test/integration/targets/vyos_linkagg/tests/cli/net_linkagg.yaml
index 93f98e7..93f98e7 100644
--- a/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/net_linkagg.yaml
+++ b/test/integration/targets/vyos_linkagg/tests/cli/net_linkagg.yaml
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/aliases b/test/integration/targets/vyos_lldp/aliases
index 539d957..539d957 100644
--- a/test/integration/targets/vyos_lldp/vyos_lldp/aliases
+++ b/test/integration/targets/vyos_lldp/aliases
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/defaults/main.yaml b/test/integration/targets/vyos_lldp/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_lldp/vyos_lldp/defaults/main.yaml
+++ b/test/integration/targets/vyos_lldp/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tasks/cli.yaml b/test/integration/targets/vyos_lldp/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_lldp/vyos_lldp/tasks/cli.yaml
+++ b/test/integration/targets/vyos_lldp/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tasks/main.yaml b/test/integration/targets/vyos_lldp/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_lldp/vyos_lldp/tasks/main.yaml
+++ b/test/integration/targets/vyos_lldp/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/basic.yaml b/test/integration/targets/vyos_lldp/tests/cli/basic.yaml
index bc7774f..badd3a9 100644
--- a/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_lldp/tests/cli/basic.yaml
@@ -2,11 +2,11 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Make sure LLDP is not running before tests
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - name: Enable LLDP service
-  vyos_lldp:
+  vyos.vyos.vyos_lldp:
     state: present
   register: result
 
@@ -16,7 +16,7 @@
       - '"set service lldp" in result.commands'
 
 - name: Enable LLDP service again (idempotent)
-  vyos_lldp:
+  vyos.vyos.vyos_lldp:
     state: present
   register: result
 
@@ -25,7 +25,7 @@
       - 'result.changed == false'
 
 - name: Disable LLDP service
-  vyos_lldp:
+  vyos.vyos.vyos_lldp:
     state: absent
   register: result
 
@@ -35,7 +35,7 @@
       - '"delete service lldp" in result.commands'
 
 - name:
-  vyos_lldp:
+  vyos.vyos.vyos_lldp:
     state: absent
   register: result
 
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/net_lldp.yaml b/test/integration/targets/vyos_lldp/tests/cli/net_lldp.yaml
index cf8f97c..e68d5a6 100644
--- a/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/net_lldp.yaml
+++ b/test/integration/targets/vyos_lldp/tests/cli/net_lldp.yaml
@@ -5,7 +5,7 @@
 # implementation module and module run is successful.
 
 - name: Make sure LLDP is not running - setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - name: Enable LLDP service using platform agnostic module
@@ -19,7 +19,7 @@
       - '"set service lldp" in result.commands'
 
 - name: Make sure LLDP is not running - teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - debug: msg="END vyos cli/net_lldp.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases b/test/integration/targets/vyos_lldp_interface/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases
+++ b/test/integration/targets/vyos_lldp_interface/aliases
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml b/test/integration/targets/vyos_lldp_interface/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml
+++ b/test/integration/targets/vyos_lldp_interface/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml b/test/integration/targets/vyos_lldp_interface/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml
+++ b/test/integration/targets/vyos_lldp_interface/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml b/test/integration/targets/vyos_lldp_interface/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml
+++ b/test/integration/targets/vyos_lldp_interface/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
index 362d181..e91091b 100644
--- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
@@ -2,11 +2,11 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Make sure LLDP is not running before tests
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - name: Create LLDP configuration
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
   register: result
@@ -17,7 +17,7 @@
       - '"set service lldp interface eth1" in result.commands'
 
 - name: Create LLDP configuration again (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
   register: result
@@ -27,7 +27,7 @@
       - 'result.changed == false'
 
 - name: Disable LLDP configuration
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: disabled
   register: result
@@ -38,7 +38,7 @@
       - '"set service lldp interface eth1 disable" in result.commands'
 
 - name: Disable LLDP configuration again (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: disabled
   register: result
@@ -48,7 +48,7 @@
       - 'result.changed == false'
 
 - name: Enable LLDP configuration
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: enabled
   register: result
@@ -59,7 +59,7 @@
       - '"delete service lldp interface eth1 disable" in result.commands'
 
 - name: Enable LLDP configuration again (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: enabled
   register: result
@@ -69,7 +69,7 @@
       - 'result.changed == false'
 
 - name: Delete LLDP configuration
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: absent
   register: result
@@ -80,7 +80,7 @@
       - '"delete service lldp interface eth1" in result.commands'
 
 - name: Delete LLDP configuration again (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: absent
   register: result
@@ -90,7 +90,7 @@
       - 'result.changed == false'
 
 - name: Create aggregate of LLDP interface configurations
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     aggregate:
     - name: eth1
     - name: eth2
@@ -104,7 +104,7 @@
       - '"set service lldp interface eth2" in result.commands'
 
 - name: Create aggregate of LLDP interface configurations again (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     aggregate:
     - name: eth1
     - name: eth2
@@ -116,7 +116,7 @@
       - 'result.changed == false'
 
 - name: Override LLDP interface configuration on aggregate
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     aggregate:
     - name: eth1
     - { name: eth2, state: disabled }
@@ -129,7 +129,7 @@
       - '"set service lldp interface eth2 disable" in result.commands'
 
 - name: Override LLDP interface configuration on aggregate again (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     aggregate:
     - name: eth1
     - { name: eth2, state: disabled }
@@ -141,7 +141,7 @@
       - 'result.changed == false'
 
 - name: Delete aggregate of LLDP interface configurations
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     aggregate:
     - name: eth1
     - name: eth2
@@ -155,7 +155,7 @@
       - '"delete service lldp interface eth2" in result.commands'
 
 - name: Delete aggregate of LLDP interface configurations (idempotent)
-  vyos_lldp_interface:
+  vyos.vyos.vyos_lldp_interface:
     aggregate:
     - name: eth1
     - name: eth2
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml b/test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
index 49cd8b0..1710b7e 100644
--- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
+++ b/test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
@@ -5,7 +5,7 @@
 # implementation module and module run is successful.
 
 - name: Make sure LLDP is not running - setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - name: Create LLDP configuration using platform agnostic module
@@ -20,7 +20,7 @@
       - '"set service lldp interface eth1" in result.commands'
 
 - name: Make sure LLDP is not running - teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - debug: msg="END vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_logging/vyos_logging/aliases b/test/integration/targets/vyos_logging/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_logging/vyos_logging/aliases
+++ b/test/integration/targets/vyos_logging/aliases
diff --git a/test/integration/targets/vyos_logging/vyos_logging/defaults/main.yaml b/test/integration/targets/vyos_logging/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_logging/vyos_logging/defaults/main.yaml
+++ b/test/integration/targets/vyos_logging/defaults/main.yaml
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tasks/cli.yaml b/test/integration/targets/vyos_logging/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_logging/vyos_logging/tasks/cli.yaml
+++ b/test/integration/targets/vyos_logging/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tasks/main.yaml b/test/integration/targets/vyos_logging/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_logging/vyos_logging/tasks/main.yaml
+++ b/test/integration/targets/vyos_logging/tasks/main.yaml
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tests/cli/basic.yaml b/test/integration/targets/vyos_logging/tests/cli/basic.yaml
index 6b13334..144f8d3 100644
--- a/test/integration/targets/vyos_logging/vyos_logging/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_logging/tests/cli/basic.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: set-up logging
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     dest: console
     facility: all
     level: info
@@ -15,7 +15,7 @@
       - '"set system syslog console facility all level info" in result.commands'
 
 - name: set-up logging again (idempotent)
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     dest: console
     facility: all
     level: info
@@ -27,7 +27,7 @@
       - 'result.changed == false'
 
 - name: file logging
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
@@ -41,7 +41,7 @@
       - '"set system syslog file test facility all level notice" in result.commands'
 
 - name: file logging again (idempotent)
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
@@ -54,7 +54,7 @@
       - 'result.changed == false'
 
 - name: delete logging
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
@@ -68,7 +68,7 @@
       - '"delete system syslog file test facility all level notice" in result.commands'
 
 - name: delete logging again (idempotent)
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
@@ -81,7 +81,7 @@
       - 'result.changed == false'
 
 - name: Add logging collections
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     aggregate:
       - { dest: file, name: test1, facility: all, level: info }
       - { dest: file, name: test2, facility: news, level: debug }
@@ -95,7 +95,7 @@
       - '"set system syslog file test2 facility news level debug" in result.commands'
 
 - name: Add and remove logging collections with overrides
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     aggregate:
       - { dest: console, facility: all, level: info }
       - { dest: file, name: test1, facility: all, level: info, state: absent }
@@ -110,7 +110,7 @@
       - '"set system syslog console facility daemon level warning" in result.commands'
 
 - name: Remove logging collections
-  vyos_logging:
+  vyos.vyos.vyos_logging:
     aggregate:
       - { dest: console, facility: all, level: info }
       - { dest: console, facility: daemon, level: warning }
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tests/cli/net_logging.yaml b/test/integration/targets/vyos_logging/tests/cli/net_logging.yaml
index 7c62d72..7c62d72 100644
--- a/test/integration/targets/vyos_logging/vyos_logging/tests/cli/net_logging.yaml
+++ b/test/integration/targets/vyos_logging/tests/cli/net_logging.yaml
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/defaults/main.yaml b/test/integration/targets/vyos_smoke/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_smoke/vyos_smoke/defaults/main.yaml
+++ b/test/integration/targets/vyos_smoke/defaults/main.yaml
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tasks/cli.yaml b/test/integration/targets/vyos_smoke/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_smoke/vyos_smoke/tasks/cli.yaml
+++ b/test/integration/targets/vyos_smoke/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tasks/main.yaml b/test/integration/targets/vyos_smoke/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_smoke/vyos_smoke/tasks/main.yaml
+++ b/test/integration/targets/vyos_smoke/tasks/main.yaml
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_config.yaml b/test/integration/targets/vyos_smoke/tests/cli/common_config.yaml
index bad66f5..1c07980 100644
--- a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_config.yaml
+++ b/test/integration/targets/vyos_smoke/tests/cli/common_config.yaml
@@ -1,10 +1,10 @@
 # vyos.py in plugins and module_utils/network covered by these as well
 # hit NetworkConfig
 - name: configure simple config command
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name smoke
 
 - name: return host name to inventory_hostname
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_utils.yaml b/test/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
index 7dfbb41..db837c5 100644
--- a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_utils.yaml
+++ b/test/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
@@ -3,7 +3,7 @@
 
 # hit ComplexList
 - name: get output for single command
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands:
       - show version
   register: result
@@ -18,20 +18,20 @@
 # Note, this can't be run on AWS because fully testing the vyos_interface dependencies
 # requires the ability to create and remove interfaces other than eth0
 - name: enable eth1
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: True
     state: present
   register: result
 
 - name: Check intent arguments
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: up
   register: result
 
 - name: Check intent arguments (failed condition)
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     state: down
   ignore_errors: yes
@@ -43,7 +43,7 @@
       - "'state eq(down)' in result.failed_conditions"
 
 - name: Config + intent
-  vyos_interface:
+  vyos.vyos.vyos_interface:
     name: eth1
     enabled: False
     state: down
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/misc_tests.yaml b/test/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
index a56d057..720f95e 100644
--- a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/misc_tests.yaml
+++ b/test/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
@@ -1,11 +1,11 @@
 # hit check conditional in module_utils.network.vyos -> load_config()
 - name: configure simple config command
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines: set system host-name check-test
   check_mode: yes
 
 - name: get host name
-  vyos_command:
+  vyos.vyos.vyos_command:
     commands: show host name
   register: result
 
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/aliases b/test/integration/targets/vyos_static_route/aliases
index 539d957..539d957 100644
--- a/test/integration/targets/vyos_static_route/vyos_static_route/aliases
+++ b/test/integration/targets/vyos_static_route/aliases
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/defaults/main.yaml b/test/integration/targets/vyos_static_route/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_static_route/vyos_static_route/defaults/main.yaml
+++ b/test/integration/targets/vyos_static_route/defaults/main.yaml
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tasks/cli.yaml b/test/integration/targets/vyos_static_route/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_static_route/vyos_static_route/tasks/cli.yaml
+++ b/test/integration/targets/vyos_static_route/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tasks/main.yaml b/test/integration/targets/vyos_static_route/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_static_route/vyos_static_route/tasks/main.yaml
+++ b/test/integration/targets/vyos_static_route/tasks/main.yaml
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/basic.yaml b/test/integration/targets/vyos_static_route/tests/cli/basic.yaml
index f8fa87d..122e49a 100644
--- a/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_static_route/tests/cli/basic.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: create static route
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     state: present
@@ -14,7 +14,7 @@
       - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: create static route again (idempotent)
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0
     mask: 24
     next_hop: 192.168.42.64
@@ -26,7 +26,7 @@
       - 'result.changed == false'
 
 - name: modify admin distance of static route
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
@@ -39,7 +39,7 @@
       - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64 distance 1" in result.commands'
 
 - name: modify admin distance of static route again (idempotent)
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0
     mask: 24
     next_hop: 192.168.42.64
@@ -52,7 +52,7 @@
       - 'result.changed == false'
 
 - name: delete static route
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
@@ -65,7 +65,7 @@
       - '"delete protocols static route 172.24.0.0/24" in result.commands'
 
 - name: delete static route again (idempotent)
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
@@ -77,7 +77,7 @@
       - 'result.changed == false'
 
 - name: Add static route collections
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     aggregate:
       - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
       - { prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64 }
@@ -91,7 +91,7 @@
       - '"set protocols static route 172.24.2.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: Add and remove static route collections with overrides
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     aggregate:
       - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
       - { prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent }
@@ -106,7 +106,7 @@
       - '"set protocols static route 172.24.3.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: Remove static route collections
-  vyos_static_route:
+  vyos.vyos.vyos_static_route:
     aggregate:
       - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
       - { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/net_static_route.yaml b/test/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
index e2529eb..e2529eb 100644
--- a/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/net_static_route.yaml
+++ b/test/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
diff --git a/test/integration/targets/vyos_system/vyos_system/defaults/main.yaml b/test/integration/targets/vyos_system/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_system/vyos_system/defaults/main.yaml
+++ b/test/integration/targets/vyos_system/defaults/main.yaml
diff --git a/test/integration/targets/vyos_system/vyos_system/tasks/cli.yaml b/test/integration/targets/vyos_system/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_system/vyos_system/tasks/cli.yaml
+++ b/test/integration/targets/vyos_system/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_system/vyos_system/tasks/main.yaml b/test/integration/targets/vyos_system/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_system/vyos_system/tasks/main.yaml
+++ b/test/integration/targets/vyos_system/tasks/main.yaml
diff --git a/test/integration/targets/vyos_system/vyos_system/tests/cli/basic.yaml b/test/integration/targets/vyos_system/tests/cli/basic.yaml
index c42edde..474042f 100644
--- a/test/integration/targets/vyos_system/vyos_system/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_system/tests/cli/basic.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete system name-server 192.0.2.1
       - delete system name-server 192.0.2.2
@@ -10,7 +10,7 @@
     match: none
 
 - name: configure name servers
-  vyos_system:
+  vyos.vyos.vyos_system:
     name_servers:
       - 192.0.2.1
       - 192.0.2.2
@@ -26,7 +26,7 @@
       - result.commands[2]  is search("set system name-server '192.0.2.3'")
 
 - name: verify name_servers
-  vyos_system:
+  vyos.vyos.vyos_system:
     name_servers:
       - 192.0.2.1
       - 192.0.2.2
@@ -38,7 +38,7 @@
       - result.changed == false
 
 - name: remove one
-  vyos_system:
+  vyos.vyos.vyos_system:
     name_servers:
       - 192.0.2.3
     state: absent
@@ -51,7 +51,7 @@
       - result.commands[0]  is search("delete system name-server '192.0.2.3'")
 
 - name: teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete system name-server name-server 192.0.2.1
       - delete system name-server name-server 192.0.2.2
diff --git a/test/integration/targets/vyos_system/vyos_system/tests/cli/net_system.yaml b/test/integration/targets/vyos_system/tests/cli/net_system.yaml
index b7813c0..3688866 100644
--- a/test/integration/targets/vyos_system/vyos_system/tests/cli/net_system.yaml
+++ b/test/integration/targets/vyos_system/tests/cli/net_system.yaml
@@ -5,7 +5,7 @@
 # implementation module and module run is successful.
 
 - name: setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete system name-server 192.0.2.1
     match: none
@@ -22,7 +22,7 @@
       - result.commands[0]  is search("set system name-server '192.0.2.1'")
 
 - name: setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete system name-server 192.0.2.1
     match: none
diff --git a/test/integration/targets/vyos_user/vyos_user/aliases b/test/integration/targets/vyos_user/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_user/vyos_user/aliases
+++ b/test/integration/targets/vyos_user/aliases
diff --git a/test/integration/targets/vyos_user/vyos_user/defaults/main.yaml b/test/integration/targets/vyos_user/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_user/vyos_user/defaults/main.yaml
+++ b/test/integration/targets/vyos_user/defaults/main.yaml
diff --git a/test/integration/targets/vyos_user/vyos_user/tasks/cli.yaml b/test/integration/targets/vyos_user/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_user/vyos_user/tasks/cli.yaml
+++ b/test/integration/targets/vyos_user/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_user/vyos_user/tasks/main.yaml b/test/integration/targets/vyos_user/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_user/vyos_user/tasks/main.yaml
+++ b/test/integration/targets/vyos_user/tasks/main.yaml
diff --git a/test/integration/targets/vyos_user/vyos_user/tests/cli/auth.yaml b/test/integration/targets/vyos_user/tests/cli/auth.yaml
index ff14bd7..566191e 100644
--- a/test/integration/targets/vyos_user/vyos_user/tests/cli/auth.yaml
+++ b/test/integration/targets/vyos_user/tests/cli/auth.yaml
@@ -1,7 +1,7 @@
 ---
 - block:
   - name: Create user with password
-    vyos_user:
+    vyos.vyos.vyos_user:
       name: auth_user
       role: admin
       state: present
@@ -28,7 +28,7 @@
 
   always:
   - name: delete user
-    vyos_user:
+    vyos.vyos.vyos_user:
       name: auth_user
       state: absent
     register: result
diff --git a/test/integration/targets/vyos_user/vyos_user/tests/cli/basic.yaml b/test/integration/targets/vyos_user/tests/cli/basic.yaml
index 346ecda..a71f9c6 100644
--- a/test/integration/targets/vyos_user/vyos_user/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_user/tests/cli/basic.yaml
@@ -2,14 +2,14 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Setup
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete system login user ansibletest1
       - delete system login user ansibletest2
       - delete system login user ansibletest3
 
 - name: Create user
-  vyos_user:
+  vyos.vyos.vyos_user:
     name: ansibletest1
     configured_password: test
     state: present
@@ -22,7 +22,7 @@
       - '"authentication plaintext-password" in result.commands[0]'
 
 - name: Collection of users (SetUp)
-  vyos_user:
+  vyos.vyos.vyos_user:
     aggregate:
       - name: ansibletest2
       - name: ansibletest3
@@ -36,7 +36,7 @@
       - 'result.commands == ["set system login user ansibletest2 level operator", "set system login user ansibletest3 level operator"]'
 
 - name: Add user again (Idempotent)
-  vyos_user:
+  vyos.vyos.vyos_user:
     name: ansibletest1
     configured_password: test
     state: present
@@ -49,7 +49,7 @@
       - 'result.commands | length == 0'
 
 - name: Add collection of users (Idempotent)
-  vyos_user:
+  vyos.vyos.vyos_user:
     aggregate:
       - name: ansibletest2
       - name: ansibletest3
@@ -63,7 +63,7 @@
       - 'result.commands | length == 0'
 
 - name: tearDown
-  vyos_user:
+  vyos.vyos.vyos_user:
     users:
       - name: ansibletest1
       - name: ansibletest2
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/aliases b/test/integration/targets/vyos_vlan/aliases
index e69de29..e69de29 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/aliases
+++ b/test/integration/targets/vyos_vlan/aliases
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/defaults/main.yaml b/test/integration/targets/vyos_vlan/defaults/main.yaml
index 9ef5ba5..9ef5ba5 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/defaults/main.yaml
+++ b/test/integration/targets/vyos_vlan/defaults/main.yaml
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tasks/cli.yaml b/test/integration/targets/vyos_vlan/tasks/cli.yaml
index 890d3ac..890d3ac 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/tasks/cli.yaml
+++ b/test/integration/targets/vyos_vlan/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tasks/main.yaml b/test/integration/targets/vyos_vlan/tasks/main.yaml
index 415c99d..415c99d 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/tasks/main.yaml
+++ b/test/integration/targets/vyos_vlan/tasks/main.yaml
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/basic.yaml b/test/integration/targets/vyos_vlan/tests/cli/basic.yaml
index a47f6b9..6e4417e 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/basic.yaml
+++ b/test/integration/targets/vyos_vlan/tests/cli/basic.yaml
@@ -2,7 +2,7 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove vlan used in test
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete interfaces ethernet eth1 vif 100
       - delete interfaces ethernet eth0 vif 5
@@ -11,7 +11,7 @@
       - delete interfaces ethernet eth1 vif 201
 
 - name: set vlan with name
-  vyos_vlan: &name
+  vyos.vyos.vyos_vlan: &name
     vlan_id: 100
     name: vlan-100
     interfaces: eth1
@@ -23,7 +23,7 @@
       - "'set interfaces ethernet eth1 vif 100 description vlan-100' in result.commands"
 
 - name: set vlan with name(idempotence)
-  vyos_vlan: *name
+  vyos.vyos.vyos_vlan: *name
   register: result
 
 - assert:
@@ -31,7 +31,7 @@
       - "result.changed == false"
 
 - name: set vlan with address
-  vyos_vlan: &address
+  vyos.vyos.vyos_vlan: &address
     vlan_id: 5
     address: 192.168.5.12/24
     interfaces: eth0
@@ -43,7 +43,7 @@
       - "'set interfaces ethernet eth0 vif 5 address 192.168.5.12/24' in result.commands"
 
 - name: set vlan with address(idempotence)
-  vyos_vlan: *address
+  vyos.vyos.vyos_vlan: *address
   register: result
 
 - assert:
@@ -51,7 +51,7 @@
       - "result.changed == false"
 
 - name: delete
-  vyos_vlan: &delete
+  vyos.vyos.vyos_vlan: &delete
     vlan_id: 100
     interfaces: eth1
     state: absent
@@ -63,7 +63,7 @@
       - "'delete interfaces ethernet eth1 vif 100' in result.commands"
 
 - name: delete(idempotence)
-  vyos_vlan: *delete
+  vyos.vyos.vyos_vlan: *delete
   register: result
 
 - assert:
@@ -71,7 +71,7 @@
       - "result.changed == false"
 
 - name: Create VLANs using aggregate
-  vyos_vlan: &agg_vlan
+  vyos.vyos.vyos_vlan: &agg_vlan
     aggregate:
       - { vlan_id: 101, name: voice, interfaces: "eth0" }
       - { vlan_id: 201, name: mgm, interfaces: "eth1" }
@@ -85,7 +85,7 @@
       - "'set interfaces ethernet eth1 vif 201 description mgm' in result.commands"
 
 - name: Create VLANs using aggregate (idempotent)
-  vyos_vlan: *agg_vlan
+  vyos.vyos.vyos_vlan: *agg_vlan
   register: result
 
 - assert:
@@ -93,7 +93,7 @@
       - "result.changed == false"
 
 - name: teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete interfaces ethernet eth1 vif 100
       - delete interfaces ethernet eth0 vif 5
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/intent.yaml b/test/integration/targets/vyos_vlan/tests/cli/intent.yaml
index 98c8697..7c78937 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/intent.yaml
+++ b/test/integration/targets/vyos_vlan/tests/cli/intent.yaml
@@ -2,13 +2,13 @@
 - debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove vlan used in test
-  vyos_config: &delete
+  vyos.vyos.vyos_config: &delete
     lines:
       - delete interfaces ethernet eth1 vif 100
       - delete interfaces ethernet eth0 vif 100
 
 - name: set vlan with name
-  vyos_vlan:
+  vyos.vyos.vyos_vlan:
     vlan_id: 100
     name: vlan-100
     interfaces: eth1
@@ -20,7 +20,7 @@
       - "'set interfaces ethernet eth1 vif 100 description vlan-100' in result.commands"
 
 - name: check vlan interface intent
-  vyos_vlan:
+  vyos.vyos.vyos_vlan:
     vlan_id: 100
     name: vlan-100
     associated_interfaces: eth1
@@ -31,7 +31,7 @@
       - "result.failed == false"
 
 - name: vlan interface config + intent
-  vyos_vlan:
+  vyos.vyos.vyos_vlan:
     vlan_id: 100
     interfaces: eth0
     associated_interfaces:
@@ -44,7 +44,7 @@
       - "result.failed == false"
 
 - name: vlan intent fail
-  vyos_vlan:
+  vyos.vyos.vyos_vlan:
     vlan_id: 100
     associated_interfaces:
     - eth3
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/multiple.yaml b/test/integration/targets/vyos_vlan/tests/cli/multiple.yaml
index 25bc1af..53e93fd 100644
--- a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/multiple.yaml
+++ b/test/integration/targets/vyos_vlan/tests/cli/multiple.yaml
@@ -2,14 +2,14 @@
 - debug: msg="START cli/multiple.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove vlan used in test
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete interfaces ethernet eth0 vif 5
       - delete interfaces ethernet eth0 vif 100
       - delete interfaces ethernet eth1 vif 100
 
 - name: Add multiple interfaces to vlan
-  vyos_vlan: &multiple
+  vyos.vyos.vyos_vlan: &multiple
     vlan_id: 100
     interfaces:
       - eth0
@@ -23,7 +23,7 @@
       - "'set interfaces ethernet eth1 vif 100' in result.commands"
 
 - name: Add multiple interfaces to vlan(idempotence)
-  vyos_vlan: *multiple
+  vyos.vyos.vyos_vlan: *multiple
   register: result
 
 - assert:
@@ -31,7 +31,7 @@
       - "result.changed == false"
 
 - name: delete vlan with multiple interfaces
-  vyos_vlan: &delete_multiple
+  vyos.vyos.vyos_vlan: &delete_multiple
     vlan_id: 100
     interfaces:
       - eth0
@@ -46,7 +46,7 @@
       - "'delete interfaces ethernet eth1 vif 100' in result.commands"
 
 - name: delete vlan with multiple interfaces(idempotence)
-  vyos_vlan: *delete_multiple
+  vyos.vyos.vyos_vlan: *delete_multiple
   register: result
 
 - assert:
@@ -54,7 +54,7 @@
       - "result.changed == false"
 
 - name: teardown
-  vyos_config:
+  vyos.vyos.vyos_config:
     lines:
       - delete interfaces ethernet eth0 vif 100
       - delete interfaces ethernet eth1 vif 100