diff --git a/handlers/main.yml b/handlers/main.yml
index f84deaa..5e008d4 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -10,7 +10,7 @@
     - ansible_connection != 'chroot'
     - ansible_facts['os_family'] != 'AIX'
     - ansible_facts['os_family'] != 'OpenWrt'
-  listen: Reload_sshd
+  listen: sshd_reload
 
 - name: Restart the SSH service
   ansible.builtin.service:
@@ -22,7 +22,7 @@
     - ansible_connection != 'chroot'
     - ansible_facts['os_family'] != 'AIX'
     - ansible_facts['os_family'] != 'OpenWrt'
-  listen: Restart_sshd
+  listen: sshd_restart
 
 # sshd on AIX cannot be 'reloaded', it must be Stopped+Started.
 # It's dangerous to do this in two tasks.. you're stopping SSH and then trying to SSH back in to start it.
@@ -37,7 +37,7 @@
     stopsrc -s sshd
     until $(lssrc -s sshd | grep -q inoperative); do sleep 1; done
     startsrc -s sshd
-  listen: Reload_sshd
+  listen: sshd_reload
   changed_when: false
   when:
     - sshd_allow_reload|bool
@@ -51,4 +51,4 @@
   when:
     - sshd_allow_reload|bool
     - ansible_facts['os_family'] == 'OpenWrt'
-  listen: Reload_sshd
+  listen: sshd_reload
diff --git a/tasks/install.yml b/tasks/install.yml
index f863f48..f26179c 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -25,7 +25,7 @@
   when:
     - sshd_sysconfig | bool
     - __sshd_sysconfig_supports_use_strong_rng or __sshd_sysconfig_supports_crypto_policy
-  notify: Restart_sshd
+  notify: sshd_restart
 
 - name: Check FIPS mode
   ansible.builtin.include_tasks: check_fips.yml
diff --git a/tasks/install_config.yml b/tasks/install_config.yml
index 4aa17a2..f95df69 100644
--- a/tasks/install_config.yml
+++ b/tasks/install_config.yml
@@ -24,7 +24,7 @@
         {{ sshd_binary | quote }} -t -f %s
       {% endif %}
     backup: "{{ sshd_backup }}"
-  notify: Reload_sshd
+  notify: sshd_reload
 
 - name: Make sure the include path is present in the main sshd_config
   ansible.builtin.lineinfile:
@@ -43,7 +43,7 @@
         {{ sshd_binary | quote }} -t -f %s
       {% endif %}
     backup: "{{ sshd_backup }}"
-  notify: Reload_sshd
+  notify: sshd_reload
   when:
     - sshd_main_config_file is not none
     - sshd_config_file | dirname == sshd_main_config_file ~ '.d'
diff --git a/tasks/install_namespace.yml b/tasks/install_namespace.yml
index 3a879e0..23320a9 100644
--- a/tasks/install_namespace.yml
+++ b/tasks/install_namespace.yml
@@ -21,4 +21,4 @@
         {{ sshd_binary | quote }} -t -f %s
       {% endif %}
     backup: "{{ sshd_backup }}"
-  notify: Reload_sshd
+  notify: sshd_reload
diff --git a/tasks/install_service.yml b/tasks/install_service.yml
index 41e164f..4e36ffa 100644
--- a/tasks/install_service.yml
+++ b/tasks/install_service.yml
@@ -12,7 +12,7 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Reload_sshd
+      notify: sshd_reload
 
     - name: Install instanced service unit file
       ansible.builtin.template:
@@ -21,7 +21,7 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Reload_sshd
+      notify: sshd_reload
       when:
         - __sshd_socket_accept | bool
 
@@ -32,7 +32,7 @@
         owner: root
         group: root
         mode: "0644"
-      notify: Reload_sshd
+      notify: sshd_reload
 
 - name: Service enabled and running
   ansible.builtin.service: