diff --git a/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb b/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
index c243a2e7..cd7dcd09 100644
--- a/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
+++ b/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
@@ -22,9 +22,10 @@ oses:
   os_name  = @host.operatingsystem.name
 
   options = []
-  if host_param('blacklist')
-    options << host_param('blacklist').split(',').collect{|x| "#{x.strip}.blacklist=yes"}.join(' ')
+  if host_param('blocklist_kernel_modules')
+    options << host_param('blocklist_kernel_modules').split(%r{,\s*}).collect{|x| "#{x.strip}.blacklist=yes"}.join(' ')
   end
+  raise("Host param 'blacklist' has been deprecated, use 'blocklist_kernel_modules' instead") if host_param('blacklist')
   if os_name == 'Debian'
     options << "auto=true"
     options << "domain=#{@host.domain}"
diff --git a/provisioning_templates/PXELinux/preseed_default_pxelinux.erb b/provisioning_templates/PXELinux/preseed_default_pxelinux.erb
index d633b88d..bfd317d9 100644
--- a/provisioning_templates/PXELinux/preseed_default_pxelinux.erb
+++ b/provisioning_templates/PXELinux/preseed_default_pxelinux.erb
@@ -19,9 +19,10 @@ oses:
 #
 <%
   options = []
-  if host_param('blacklist')
-    options << host_param('blacklist').split(',').collect{|x| "#{x.strip}.blacklist=yes"}.join(' ')
+  if host_param('blocklist_kernel_modules')
+    options << host_param('blocklist_kernel_modules').split(%r{,\s*}).collect{|x| "#{x.strip}.blacklist=yes"}.join(' ')
   end
+  raise("Host param 'blacklist' has been deprecated, use 'blocklist_kernel_modules' instead") if host_param('blacklist')
   if @host.operatingsystem.name == 'Debian'
     options << "auto=true"
     options << "domain=#{@host.domain}"
diff --git a/provisioning_templates/cloud_init/cloud_init_default.erb b/provisioning_templates/cloud_init/cloud_init_default.erb
index 826c215e..a2c4076a 100644
--- a/provisioning_templates/cloud_init/cloud_init_default.erb
+++ b/provisioning_templates/cloud_init/cloud_init_default.erb
@@ -48,7 +48,7 @@ runcmd:
 - |
 <%= indent(2) { snippet 'remote_execution_ssh_keys' } %>
 - |
-<%= indent(2) { snippet 'blacklist_kernel_modules' } %>
+<%= indent(2) { snippet 'blocklist_kernel_modules' } %>
 - |
 <% if chef_enabled %>
 <%= indent(2) { snippet 'chef_client' } %>
diff --git a/provisioning_templates/finish/kickstart_default_finish.erb b/provisioning_templates/finish/kickstart_default_finish.erb
index 2687260d..6511fb4d 100644
--- a/provisioning_templates/finish/kickstart_default_finish.erb
+++ b/provisioning_templates/finish/kickstart_default_finish.erb
@@ -58,7 +58,7 @@ fi
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if chef_enabled %>
 <%= snippet 'chef_client' %>
diff --git a/provisioning_templates/finish/preseed_default_finish.erb b/provisioning_templates/finish/preseed_default_finish.erb
index 676a4cc7..d09db19b 100644
--- a/provisioning_templates/finish/preseed_default_finish.erb
+++ b/provisioning_templates/finish/preseed_default_finish.erb
@@ -38,7 +38,7 @@ oses:
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if chef_enabled %>
 <%= snippet 'chef_client' %>
diff --git a/provisioning_templates/provision/autoyast_default.erb b/provisioning_templates/provision/autoyast_default.erb
index f3ca52f7..d17bb26f 100644
--- a/provisioning_templates/provision/autoyast_default.erb
+++ b/provisioning_templates/provision/autoyast_default.erb
@@ -191,7 +191,7 @@ cp /etc/resolv.conf /mnt/etc
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if puppet_enabled -%>
 <%= snippet 'puppet_setup' %>
diff --git a/provisioning_templates/provision/autoyast_sles_default.erb b/provisioning_templates/provision/autoyast_sles_default.erb
index e4a0661a..f118512c 100644
--- a/provisioning_templates/provision/autoyast_sles_default.erb
+++ b/provisioning_templates/provision/autoyast_sles_default.erb
@@ -208,7 +208,7 @@ cp /etc/resolv.conf /mnt/etc
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if puppet_enabled -%>
 <%= snippet 'puppet_setup' %>
diff --git a/provisioning_templates/provision/kickstart_default.erb b/provisioning_templates/provision/kickstart_default.erb
index 7f3630a3..10354085 100644
--- a/provisioning_templates/provision/kickstart_default.erb
+++ b/provisioning_templates/provision/kickstart_default.erb
@@ -294,7 +294,7 @@ fi
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if chef_enabled %>
 <%= snippet 'chef_client' %>
diff --git a/provisioning_templates/snippet/blacklist_kernel_modules.erb b/provisioning_templates/snippet/blacklist_kernel_modules.erb
index 3f16d1dd..0343b62f 100644
--- a/provisioning_templates/snippet/blacklist_kernel_modules.erb
+++ b/provisioning_templates/snippet/blacklist_kernel_modules.erb
@@ -3,9 +3,5 @@ kind: snippet
 name: blacklist_kernel_modules
 model: ProvisioningTemplate
 snippet: true
-%>
-<% if host_param('blacklist_kernel_modules') -%>
-  <% host_param('blacklist_kernel_modules').split.each do |mod| -%>
-    echo "blacklist <%= mod %>" >> /etc/modprobe.d/blacklist.conf
-  <% end -%>
-<% end -%>
+-%>
+<% raise("Snippet 'blacklist_kernel_modules' was renamed to 'blocklist_kernel_modules', update your template.") %>
diff --git a/provisioning_templates/snippet/blocklist_kernel_modules.erb b/provisioning_templates/snippet/blocklist_kernel_modules.erb
new file mode 100644
index 00000000..03f441f8
--- /dev/null
+++ b/provisioning_templates/snippet/blocklist_kernel_modules.erb
@@ -0,0 +1,11 @@
+<%#
+kind: snippet
+name: blocklist_kernel_modules
+model: ProvisioningTemplate
+snippet: true
+%>
+<% if host_param('blocklist_kernel_modules') -%>
+  <% host_param('blocklist_kernel_modules').split.each do |mod| -%>
+    echo "blacklist <%= mod %>" >> /etc/modprobe.d/blocklist.conf
+  <% end -%>
+<% end -%>
diff --git a/provisioning_templates/user_data/autoyast_default_user_data.erb b/provisioning_templates/user_data/autoyast_default_user_data.erb
index f9d696bc..46a86e5e 100644
--- a/provisioning_templates/user_data/autoyast_default_user_data.erb
+++ b/provisioning_templates/user_data/autoyast_default_user_data.erb
@@ -24,7 +24,7 @@ echo 'root:<%= root_pass -%>' | /usr/sbin/chpasswd -e
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if puppet_enabled %>
 <% if host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
diff --git a/provisioning_templates/user_data/kickstart_default_user_data.erb b/provisioning_templates/user_data/kickstart_default_user_data.erb
index 11522291..60e12e88 100644
--- a/provisioning_templates/user_data/kickstart_default_user_data.erb
+++ b/provisioning_templates/user_data/kickstart_default_user_data.erb
@@ -49,7 +49,7 @@ fi
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if chef_enabled %>
 <%= snippet 'chef_client' %>
diff --git a/provisioning_templates/user_data/preseed_default_user_data.erb b/provisioning_templates/user_data/preseed_default_user_data.erb
index 134a045f..e93ef53e 100644
--- a/provisioning_templates/user_data/preseed_default_user_data.erb
+++ b/provisioning_templates/user_data/preseed_default_user_data.erb
@@ -30,7 +30,7 @@ echo 'Acquire::http::Proxy "<%= proxy_uri %>";' >> /etc/apt/apt.conf
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<%= snippet "blacklist_kernel_modules" %>
+<%= snippet "blocklist_kernel_modules" %>
 
 <% if chef_enabled %>
 <%= snippet 'chef_client' %>