diff --git a/roles/mkfs/meta/main.yml b/roles/mkfs/meta/main.yml
index 002fbb6..1fff67d 100644
--- a/roles/mkfs/meta/main.yml
+++ b/roles/mkfs/meta/main.yml
@@ -10,7 +10,7 @@ galaxy_info:
 
   platforms:
     - name: "Ubuntu"
-      versions: [ "jammy", "noble" ]
+      versions: ["jammy", "noble"]
 
   galaxy_tags: []
 
diff --git a/roles/mkfs/molecule/default/converge.yml b/roles/mkfs/molecule/default/converge.yml
index aeadc57..93e2908 100644
--- a/roles/mkfs/molecule/default/converge.yml
+++ b/roles/mkfs/molecule/default/converge.yml
@@ -7,16 +7,16 @@
     - name: "Check if the disk file already exists"
       ansible.builtin.stat:
         path: /tmp/test_file
-      register: disk_file
+      register: mkfs_disk_file
 
     - name: "Create a file to act as a disk if it doesn't exist"
       ansible.builtin.command: dd if=/dev/zero of=/tmp/test_file bs=1000000 count=100
-      when: not disk_file.stat.exists
-      register: dd_output
-      changed_when: dd_output.rc != 0
+      when: not mkfs_disk_file.stat.exists
+      register: mkfs_dd_output
+      changed_when: mkfs_dd_output.rc != 0
 
   roles:
-    - role: genlab.mkfs
+    - role: genlab.common.mkfs
       mkfs_device: "/tmp/test_file"
       mkfs_type: ext3
       mkfs_state: present
diff --git a/roles/mkfs/molecule/default/verify.yml b/roles/mkfs/molecule/default/verify.yml
index 000a70d..b9498c4 100644
--- a/roles/mkfs/molecule/default/verify.yml
+++ b/roles/mkfs/molecule/default/verify.yml
@@ -7,19 +7,19 @@
   tasks:
     - name: "Attach the file to a loop device"
       ansible.builtin.command: losetup /dev/loop3 /tmp/test_file
-      register: loop_device
-      changed_when: loop_device.rc != 0
+      register: mkfs_loop_device
+      changed_when: mkfs_loop_device.rc != 0
 
     - name: "Verify the filesystem type"
       ansible.builtin.command: blkid /dev/loop3
-      register: blkid_output
-      changed_when: blkid_output.rc != 0
+      register: mkfs_blkid_output
+      changed_when: mkfs_blkid_output.rc != 0
 
     - name: "Ensure filesystem is ext3"
       ansible.builtin.assert:
         that:
-          - "'TYPE=\"ext3\"' in blkid_output.stdout"
+          - "'TYPE=\"ext3\"' in mkfs_blkid_output.stdout"
 
     - name: "Explore stdout"
       ansible.builtin.debug:
-        var: blkid_output.stdout
+        var: mkfs_blkid_output.stdout