diff --git a/roles/mail_forwarder/molecule/default/tests/test_default.py b/roles/mail_forwarder/molecule/default/tests/test_default.py
index 2356291fa18eea98986a0b62395cbca621a98ea2..71028f2eed4e2dfb55ec8597b37e3dc2c99b1be1 100644
--- a/roles/mail_forwarder/molecule/default/tests/test_default.py
+++ b/roles/mail_forwarder/molecule/default/tests/test_default.py
@@ -88,7 +88,7 @@ def test_firewall_configuration_file(host):
 
 def test_smtp_server_dh_parameter_file(host):
     """
-    Tests if the Diffie-Helman parameter file has been generated
+    Tests if the Diffie-Hellman parameter file has been generated
     correctly.
     """
 
@@ -109,7 +109,7 @@ def test_smtp_server_dh_parameter_file(host):
 
 def test_smtp_server_uses_correct_dh_parameters(host):
     """
-    Tests if the SMTP server uses the generated Diffie-Helman parameter.
+    Tests if the SMTP server uses the generated Diffie-Hellman parameter.
     """
 
     hostname = host.run('hostname').stdout.strip()
diff --git a/roles/mail_forwarder/tasks/main.yml b/roles/mail_forwarder/tasks/main.yml
index a6bde5bb0f30e2da8d432fae9c84f13e8b80f467..d5dcbdfd2bc9a6398eaeb1ab8370a7bba157f5db 100644
--- a/roles/mail_forwarder/tasks/main.yml
+++ b/roles/mail_forwarder/tasks/main.yml
@@ -24,7 +24,7 @@
     group: root
     mode: 0644
 
-- name: Generate the SMTP server Diffie-Helman parameter
+- name: Generate the SMTP server Diffie-Hellman parameter
   openssl_dhparam:
     owner: root
     group: root
diff --git a/roles/mail_server/molecule/default/tests/test_default.py b/roles/mail_server/molecule/default/tests/test_default.py
index cabbb459739db10b0cfc2600783510b4a719d6b4..0dd23b8993a35d4d410e4d65038c213d8de5052e 100644
--- a/roles/mail_server/molecule/default/tests/test_default.py
+++ b/roles/mail_server/molecule/default/tests/test_default.py
@@ -359,7 +359,7 @@ def test_firewall_configuration_file(host):
 
 def test_smtp_server_dh_parameter_file(host):
     """
-    Tests if the Diffie-Helman parameter file has been generated
+    Tests if the Diffie-Hellman parameter file has been generated
     correctly.
     """
 
@@ -380,7 +380,7 @@ def test_smtp_server_dh_parameter_file(host):
 
 def test_smtp_server_uses_correct_dh_parameters(host):
     """
-    Tests if the SMTP server uses the generated Diffie-Helman parameter.
+    Tests if the SMTP server uses the generated Diffie-Hellman parameter.
     """
 
     hostname = host.run('hostname').stdout.strip()
@@ -401,7 +401,7 @@ def test_smtp_server_uses_correct_dh_parameters(host):
 
 def test_imap_server_uses_correct_dh_parameters(host):
     """
-    Tests if the IMAP server uses correct Diffie-Helman parameters.
+    Tests if the IMAP server uses correct Diffie-Hellman parameters.
     """
 
     connection = host.run("gnutls-cli --no-ca-verification --starttls-proto=imap --port 143 "
diff --git a/roles/mail_server/tasks/main.yml b/roles/mail_server/tasks/main.yml
index 5858871cbebeb0f76eea8af77f0dbea58ac8300f..9a0529c2a8c057a26bce0aaed2736fbae5395b1d 100644
--- a/roles/mail_server/tasks/main.yml
+++ b/roles/mail_server/tasks/main.yml
@@ -59,7 +59,7 @@
   notify:
     - Restart Postfix
 
-- name: Generate the SMTP server Diffie-Helman parameter
+- name: Generate the SMTP server Diffie-Hellman parameter
   openssl_dhparam:
     owner: root
     group: root
diff --git a/roles/web_server/molecule/default/tests/test_default.py b/roles/web_server/molecule/default/tests/test_default.py
index d9f7dd8ec593e33fe69dfb6b2f5386358774b934..c3de34533f6cf3e7b2a16db596a65de63f68ecab 100644
--- a/roles/web_server/molecule/default/tests/test_default.py
+++ b/roles/web_server/molecule/default/tests/test_default.py
@@ -238,7 +238,7 @@ def test_php_timezone_configuration(host, php_info):
 
 def test_https_server_dh_parameters_file(host):
     """
-    Tests if the Diffie-Helman parameter file has been generated
+    Tests if the Diffie-Hellman parameter file has been generated
     correctly.
     """
 
@@ -259,7 +259,7 @@ def test_https_server_dh_parameters_file(host):
 
 def test_https_server_uses_correct_dh_parameters(host):
     """
-    Tests if the HTTP server uses the generated Diffie-Helman parameter.
+    Tests if the HTTP server uses the generated Diffie-Hellman parameter.
     """
 
     hostname = host.run('hostname').stdout.strip()
diff --git a/roles/web_server/tasks/main.yml b/roles/web_server/tasks/main.yml
index 82a8c7949d40d52e0e545b1e9c20d24b0bfd364b..8f4dedb63f8f14c5dd95134b015d1ae5c0c745f5 100644
--- a/roles/web_server/tasks/main.yml
+++ b/roles/web_server/tasks/main.yml
@@ -33,7 +33,7 @@
   notify:
     - Restart nginx
 
-- name: Generate the HTTPS server Diffie-Helman parameter
+- name: Generate the HTTPS server Diffie-Hellman parameter
   openssl_dhparam:
     owner: root
     group: root
diff --git a/roles/xmpp_server/molecule/default/tests/test_default.py b/roles/xmpp_server/molecule/default/tests/test_default.py
index 103e9f252b6dd64b8db67b9199aadbb725158987..141d92148069d7f79942ec9b306c689995ccf0bf 100644
--- a/roles/xmpp_server/molecule/default/tests/test_default.py
+++ b/roles/xmpp_server/molecule/default/tests/test_default.py
@@ -126,7 +126,7 @@ def test_firewall_configuration_file(host):
 
 def test_xmpp_server_dh_parameters_file(host):
     """
-    Tests if the Diffie-Helman parameter file has been generated
+    Tests if the Diffie-Hellman parameter file has been generated
     correctly.
     """
 
diff --git a/roles/xmpp_server/molecule/default/tests/test_mandatory.py b/roles/xmpp_server/molecule/default/tests/test_mandatory.py
index e498261e66fbeef0fa8cb26ca4ff0cff6e43d78d..a2cb2d67c3232809c5297cfdd4e118976465e4dc 100644
--- a/roles/xmpp_server/molecule/default/tests/test_mandatory.py
+++ b/roles/xmpp_server/molecule/default/tests/test_mandatory.py
@@ -85,7 +85,7 @@ def test_correct_prosody_package_installed(host):
 
 def test_xmpp_server_uses_correct_dh_parameters(host):
     """
-    Tests if the HTTP server uses the generated Diffie-Helman parameter.
+    Tests if the HTTP server uses the generated Diffie-Hellman parameter.
     """
 
     fqdn = host.run('hostname -f').stdout.strip()
diff --git a/roles/xmpp_server/molecule/default/tests/test_optional.py b/roles/xmpp_server/molecule/default/tests/test_optional.py
index c7aaed13a2887e3f751f59ef17aa31aa3aa6199b..195126335bb21c5b5085a9528d3f59a53d68322d 100644
--- a/roles/xmpp_server/molecule/default/tests/test_optional.py
+++ b/roles/xmpp_server/molecule/default/tests/test_optional.py
@@ -91,7 +91,7 @@ def test_correct_prosody_package_installed(host):
 
 def test_xmpp_server_uses_correct_dh_parameters(host):
     """
-    Tests if the HTTP server uses the generated Diffie-Helman parameter.
+    Tests if the HTTP server uses the generated Diffie-Hellman parameter.
     """
 
     fqdn = host.run('hostname -f').stdout.strip()
diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index dcedd1dfe4f1a831d832aaf1e6883cc2e78130a7..9df0f8e82e12d4c5d65af7036ed197951306fe95 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -57,7 +57,7 @@
   notify:
     - Restart Prosody
 
-- name: Generate the XMPP server Diffie-Helman parameter
+- name: Generate the XMPP server Diffie-Hellman parameter
   openssl_dhparam:
     owner: root
     group: prosody