diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
index a5846dab..b087d46a 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
@@ -2,9 +2,9 @@
 
 	<div class="panel panel--padded panel--scrollable flexbox-area-grow cms-content-fields ">
 		<% if $Message %>
-		<p id="{$FormName}_error" class="message $MessageType">$Message</p>
+		<p id="{$FormName}_error" class="alert $AlertType">$Message</p>
 		<% else %>
-		<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+		<p id="{$FormName}_error" class="alert $AlertType" style="display: none"></p>
 		<% end_if %>
 
 		<fieldset>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss
index fbb65488..b8e50ac9 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss
@@ -18,9 +18,9 @@
 
 			<div class="panel panel--padded panel--scrollable flexbox-area-grow">
 				<% if $Message %>
-				<p id="{$FormName}_error" class="message $MessageType">$Message</p>
+				<p id="{$FormName}_error" class="alert $AlertType">$Message</p>
 				<% else %>
-				<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+				<p id="{$FormName}_error" class="alert $AlertType" style="display: none"></p>
 				<% end_if %>
 
 				<fieldset>
diff --git a/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss b/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss
index 8b4c9c14..3be14631 100644
--- a/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss
+++ b/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss
@@ -1,8 +1,8 @@
 <form $FormAttributes>
 	<% if $Message %>
-	<p id="{$FormName}_error" class="message $MessageType">$Message</p>
+	<p id="{$FormName}_error" class="alert $AlertType">$Message</p>
 	<% else %>
-	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+	<p id="{$FormName}_error" class="alert $AlertType" style="display: none"></p>
 	<% end_if %>
 	<fieldset>
 		<% loop $Fields %>