diff --git a/hotfixes/CVE-2017-6074.sls b/hotfixes/CVE-2017-6074.sls
--- a/hotfixes/CVE-2017-6074.sls
+++ b/hotfixes/CVE-2017-6074.sls
@@ -11,9 +11,9 @@
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 {% if grains['os_family'] == 'Debian' %}
-/etc/modprobe.d/blacklist-dccp.conf:
+/etc/modprobe.d/blocklist-dccp.conf:
   file.managed:
-    - source: salt://hotfixes/files/CVE-2017-6074-blacklist-dccp.conf
+    - source: salt://hotfixes/files/CVE-2017-6074-blocklist-dccp.conf
     - mode: 644
 {% endif %}
 
diff --git a/hotfixes/files/CVE-2017-6074-blacklist-dccp.conf b/hotfixes/files/CVE-2017-6074-blocklist-dccp.conf
rename from hotfixes/files/CVE-2017-6074-blacklist-dccp.conf
rename to hotfixes/files/CVE-2017-6074-blocklist-dccp.conf
diff --git a/roles/paas-docker/containers/files/hauk/config.php.jinja b/roles/paas-docker/containers/files/hauk/config.php.jinja
--- a/roles/paas-docker/containers/files/hauk/config.php.jinja
+++ b/roles/paas-docker/containers/files/hauk/config.php.jinja
@@ -159,11 +159,20 @@
     'TheRealBob'        => ['bob', 'charlie'],
 ],
 
-// If you want to enable pre-approved custom links only, you can choose to
-// enable reservation whitelist mode. If this setting is set to true, custom
+// Nasqueron note:
+// ---------------
+// The following expression can be potentially considered as offensive.
+// The Nasqueron project would so prefer "reserve_allowlist".
+//
+// We use this wording for compatibility pending upstream improvement.
+//
+// Upstream project note:
+// ----------------------
+// "If you want to enable pre-approved custom links only, you can choose to
+// enable reservation [allowlist] mode. If this setting is set to true, custom
 // link IDs will only be accepted if they are present in the reserved_links
 // array above - requests to share to other links than those in the array will
-// not be honored.
+// not be honored."
 "reserve_whitelist" => false,
 
 // The type of links to generate when making new links for shares. Can be any
diff --git a/roles/paas-docker/letsencrypt/files/acme-dns-auth.py b/roles/paas-docker/letsencrypt/files/acme-dns-auth.py
--- a/roles/paas-docker/letsencrypt/files/acme-dns-auth.py
+++ b/roles/paas-docker/letsencrypt/files/acme-dns-auth.py
@@ -44,7 +44,7 @@
         """Registers a new ACME-DNS account"""
 
         if allowfrom:
-            # Include whitelisted networks to the registration call
+            # Include allowed networks to the registration call
             reg_data = {"allowfrom": allowfrom}
             res = requests.post(self.acmedns_url + "/register",
                                 data=json.dumps(reg_data))