diff --git a/defaults/main.yml b/defaults/main.yml
index bfb89aa..8c301e5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,6 +3,7 @@ verified_reboot_reboot_time: 1 # Time in minutes issued to the shutdown command
 verified_reboot_reboot_msg: '*** ANSIBLE INITIATED REBOOT ***'
 verified_reboot_bootid_file: /proc/sys/kernel/random/boot_id
 verified_reboot_max_checks: 10
+verified_reboot_check_count: 0
 
 # Maximum number of seconds to wait for a connection to happen before closing and retrying.
 verified_reboot_wait_conn_timeout: 20
diff --git a/tasks/check_boot_id.yml b/tasks/check_boot_id.yml
index bb2c03e..aa41e7b 100644
--- a/tasks/check_boot_id.yml
+++ b/tasks/check_boot_id.yml
@@ -1,17 +1,17 @@
 ---
 - name: Max check count reached
   ansible.builtin.fail:
-    msg: "Max check count ({{ max_reboot_check }}) reached. Aborting after {{ reboot_check_count }} tries."
+    msg: "Max check count ({{ verified_reboot_max_checks }}) reached. Aborting after {{ verified_reboot_check_count }} tries."
   when:
-    - reboot_check_count | int >= max_reboot_check
+    - verified_reboot_check_count | int >= verified_reboot_max_checks
 
 - name: Increment check count
   ansible.builtin.set_fact:
-    reboot_check_count: "{{ reboot_check_count | int + 1 }}"
+    verified_reboot_check_count: "{{ verified_reboot_check_count | int + 1 }}"
 
 - name: Current Iteration
   ansible.builtin.debug:
-    msg: "{{ reboot_check_count }}"
+    msg: "{{ verified_reboot_check_count }}"
     verbosity: 1
 
 - name: Wait for host to connect or try again
@@ -28,20 +28,20 @@
 
 - name: Capture boot ID post reboot
   ansible.builtin.slurp:
-    src: "{{ bootid_file }}"
-  register: post_reboot_boot_id_raw
+    src: "{{ verified_reboot_bootid_file }}"
+  register: verified_reboot_post_boot_id_raw
 
 - name: Set post-reboot boot ID
   ansible.builtin.set_fact:
-    post_reboot_boot_id: "{{ post_reboot_boot_id_raw['content'] | b64decode | trim }}"
+    verified_reboot_post_boot_id: "{{ verified_reboot_post_boot_id_raw['content'] | b64decode | trim }}"
 
 - name: Debug boot IDs
   ansible.builtin.debug:
-    msg: "{{ pre_reboot_boot_id }} == {{ post_reboot_boot_id }}"
+    msg: "{{ verified_reboot_pre_boot_id }} == {{ verified_reboot_post_boot_id }}"
     verbosity: 1
 
 - name: Re-check host status
   ansible.builtin.include_tasks: check_boot_id.yml
   when:
-    - pre_reboot_boot_id == post_reboot_boot_id
-    - reboot_check_count | int < max_reboot_check
+    - verified_reboot_pre_boot_id == verified_reboot_post_boot_id
+    - verified_reboot_check_count | int < verified_reboot_max_checks