diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js
index 9a22cdf5..fb14e54a 100644
--- a/app/ui/archiveTile.js
+++ b/app/ui/archiveTile.js
@@ -486,12 +486,12 @@ module.exports.empty = function(state, emit) {
             })}
           </button>
         `;
-  const warning = state.WEB_UI.UPLOAD_AREA_WARNING_HTML
+  const uploadNotice = state.WEB_UI.UPLOAD_AREA_NOTICE_HTML
     ? html`
         <p
           class="w-full mt-8 p-2 border-default dark:border-grey-70 rounded-default text-orange-60 bg-yellow-40 text-center leading-normal"
         >
-          ${raw(state.WEB_UI.UPLOAD_AREA_WARNING_HTML)}
+          ${raw(state.WEB_UI.UPLOAD_AREA_NOTICE_HTML)}
         </p>
       `
     : '';
@@ -536,7 +536,7 @@ module.exports.empty = function(state, emit) {
       >
         ${state.translate('addFilesButton')}
       </label>
-      ${upsell} ${warning}
+      ${upsell} ${uploadNotice}
     </send-upload-area>
   `;
 
@@ -569,12 +569,12 @@ module.exports.preview = function(state, emit) {
           ${archiveDetails(state.translate, archive)}
         </div>
       `;
-  const warning = state.WEB_UI.DOWNLOAD_WARNING_HTML
+  const notice = state.WEB_UI.DOWNLOAD_NOTICE_HTML
     ? html`
         <p
           class="w-full mt-4 p-2 border-default dark:border-grey-70 rounded-default text-orange-60 bg-yellow-40 text-center leading-normal"
         >
-          ${raw(state.WEB_UI.DOWNLOAD_WARNING_HTML)}
+          ${raw(state.WEB_UI.DOWNLOAD_NOTICE_HTML)}
         </p>
       `
     : '';
@@ -594,7 +594,7 @@ module.exports.preview = function(state, emit) {
       >
         ${state.translate('downloadButtonLabel')}
       </button>
-      ${warning}
+      ${notice}
     </send-archive>
   `;
 
diff --git a/server/clientConstants.js b/server/clientConstants.js
index dc77ac0e..48e0964e 100644
--- a/server/clientConstants.js
+++ b/server/clientConstants.js
@@ -16,9 +16,9 @@ module.exports = {
     CUSTOM_FOOTER_TEXT: config.custom_footer_text,
     CUSTOM_FOOTER_URL: config.custom_footer_url,
     MAIN_NOTICE_HTML: config.main_notice_html,
-    UPLOAD_AREA_WARNING_HTML: config.upload_area_warning_html,
+    UPLOAD_AREA_NOTICE_HTML: config.upload_area_notice_html,
     DOWNLOAD_LIST_NOTICE_HTML: config.download_list_notice_html,
-    DOWNLOAD_WARNING_HTML: config.download_warning_html,
+    DOWNLOAD_NOTICE_HTML: config.download_notice_html,
     COLORS: {
       PRIMARY: config.ui_color_primary,
       ACCENT: config.ui_color_accent
diff --git a/server/config.js b/server/config.js
index fdf42886..0c71d9c1 100644
--- a/server/config.js
+++ b/server/config.js
@@ -269,20 +269,20 @@ const conf = convict({
     default: '',
     env: 'SEND_MAIN_NOTICE_HTML'
   },
-  upload_area_warning_html: {
+  upload_area_notice_html: {
     format: String,
     default: '',
-    env: 'SEND_UPLOAD_AREA_WARNING_HTML'
+    env: 'SEND_UPLOAD_AREA_NOTICE_HTML'
   },
   download_list_notice_html: {
     format: String,
     default: '',
     env: 'SEND_DOWNLOAD_LIST_NOTICE_HTML'
   },
-  download_warning_html: {
+  download_notice_html: {
     format: String,
     default: '',
-    env: 'SEND_DOWNLOAD_WARNING_HTML'
+    env: 'SEND_DOWNLOAD_NOTICE_HTML'
   },
   ui_color_primary: {
     format: String,