diff --git a/.ansible-lint b/.ansible-lint
index 38f5606..f7c8aa6 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -8,3 +8,5 @@ loop_var_prefix: "^(__|{role}_)"
 exclude_paths:
   - .github/
   - .ansible/
+  # ansible-lint thinks it's a playbook so gives an error, but its tasks are for include_task. decided to exclude it
+  - roles/rustdesk/molecule/default/client-binary-existance.yml
diff --git a/roles/rustdesk/.ansible-lint b/roles/rustdesk/.ansible-lint
index eee5545..504a9b8 100644
--- a/roles/rustdesk/.ansible-lint
+++ b/roles/rustdesk/.ansible-lint
@@ -14,4 +14,4 @@ warn_list:
 
 exclude_paths:
   - .github/
-  - molecule/default/client-binary-existance.yml # ansible-lint thinks it's a playbook so gives an error, but it's tasks for include_task. decided to exclude it
+  - molecule/default/client-binary-existance.yml # ansible-lint thinks it's a playbook so gives an error, but its tasks for include_task. decided to exclude it
diff --git a/roles/rustdesk/meta/main.yml b/roles/rustdesk/meta/main.yml
index 4bd44b0..d396088 100644
--- a/roles/rustdesk/meta/main.yml
+++ b/roles/rustdesk/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 galaxy_info:
-  role_name: "rustdesk_server"
+  role_name: "rustdesk"
   namespace: genlab
   author: "Sergey Malyuk"
   company: "Genlab, LLC"
@@ -10,8 +10,8 @@ galaxy_info:
 
   platforms:
     - name: "Ubuntu"
-      versions: [ "focal", "jammy", "noble" ]
+      versions: ["focal", "jammy", "noble"]
 
-  galaxy_tags: [ ]
+  galaxy_tags: []
 
 dependencies: []
diff --git a/roles/rustdesk/molecule/default/client-binary-existance.yml b/roles/rustdesk/molecule/default/client-binary-existance.yml
index 902a1aa..f1f76f8 100644
--- a/roles/rustdesk/molecule/default/client-binary-existance.yml
+++ b/roles/rustdesk/molecule/default/client-binary-existance.yml
@@ -1,6 +1,6 @@
 ---
 - name: "Get public IP"
-  register: public_ip
+  register: rustdesk_public_ip
   changed_when: false
   ansible.builtin.uri:
     url: https://ifconfig.me
@@ -9,17 +9,16 @@
       Accept: text/plain
       User-Agent: curl/7.68.0
 
-
 - name: "Get public key"
-  register: public_key
+  register: rustdesk_public_key
   changed_when: false
   ansible.builtin.command: "cat /opt/rustdesk-server/lib/id_ed25519.pub"
-    
+
 - name: "Get client rustdesk binary information"
   changed_when: false
   register: rustdesk_bin
   ansible.builtin.stat:
-    path: "/opt/rustdesk-server/lib/rustdesk-host={{ public_ip.content }},key={{ public_key.stdout }}.exe"
+    path: "/opt/rustdesk-server/lib/rustdesk-host={{ rustdesk_public_ip.content }},key={{ rustdesk_public_key.stdout }}.exe"
 
 - name: "Check if client binary exists"
   changed_when: false
diff --git a/roles/rustdesk/molecule/default/converge.yml b/roles/rustdesk/molecule/default/converge.yml
index 3299b75..66aeafe 100644
--- a/roles/rustdesk/molecule/default/converge.yml
+++ b/roles/rustdesk/molecule/default/converge.yml
@@ -2,4 +2,4 @@
 - name: Converge
   hosts: all
   roles:
-    - role: "genlab.rustdesk_server"
+    - role: "genlab.common.rustdesk"
diff --git a/roles/rustdesk/tasks/check-rustdesk-version.yml b/roles/rustdesk/tasks/check-rustdesk-version.yml
index 62cbb65..776b702 100644
--- a/roles/rustdesk/tasks/check-rustdesk-version.yml
+++ b/roles/rustdesk/tasks/check-rustdesk-version.yml
@@ -1,25 +1,25 @@
 ---
 
 - name: "Check hbbr version"
-  register: hbbr_output
+  register: rustdesk_hbbr_output
   changed_when: false
   ansible.builtin.command:
     cmd: "/opt/rustdesk-server/amd64/hbbr --version"
 
 - name: "Check if the version of hbbr is the expected one"
   ansible.builtin.assert:
-    that: "hbbr_output.stdout == 'hbbr {{ rustdesk_server_version }}'"
+    that: "rustdesk_hbbr_output.stdout == 'hbbr {{ rustdesk_server_version }}'"
     success_msg: "hbbr is installed and is the correct version"
     fail_msg: "hbbr is either not installed or does not match the target version"
 
 - name: "Check hbbs version"
-  register: hbbs_output
+  register: rustdesk_hbbs_output
   changed_when: false
   ansible.builtin.command:
     cmd: "/opt/rustdesk-server/amd64/hbbs --version"
 
 - name: "Check if the version of hbbs is the expected one"
   ansible.builtin.assert:
-    that: "hbbs_output.stdout == 'hbbs {{ rustdesk_server_version }}'"
+    that: "rustdesk_hbbs_output.stdout == 'hbbs {{ rustdesk_server_version }}'"
     success_msg: "hbbs is installed and is the correct version"
     fail_msg: "hbbs is either not installed or does not match the target version"