diff --git a/core/src/main/resources/org/apache/struts2/static/utils.js b/core/src/main/resources/org/apache/struts2/static/utils.js
index 1779ce57a5..9708f6f0b7 100644
--- a/core/src/main/resources/org/apache/struts2/static/utils.js
+++ b/core/src/main/resources/org/apache/struts2/static/utils.js
@@ -66,8 +66,8 @@ StrutsUtils.showValidationErrors = function(form, errors) {
 	if (errors.errors) {
 		var l, errorList = document.createElement("ul");
 
-		errorList.setAttribute("class", "errorMessage");
-		errorList.setAttribute("className", "errorMessage"); // ie hack cause ie does not support setAttribute
+		errorList.setAttribute("class", "struts-errorMessage");
+		errorList.setAttribute("className", "struts-errorMessage"); // ie hack cause ie does not support setAttribute
 
 		for ( l = 0; l < errors.errors.length; l++) {
 			var item = document.createElement("li");
diff --git a/core/src/main/resources/template/archive/ajax/form.vm b/core/src/main/resources/template/archive/ajax/form.vm
index 2ad6075e70..35f3b43398 100644
--- a/core/src/main/resources/template/archive/ajax/form.vm
+++ b/core/src/main/resources/template/archive/ajax/form.vm
@@ -36,4 +36,4 @@
 #if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
 onSubmit="return false;"
 >
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
diff --git a/core/src/main/resources/template/archive/simple/checkboxlist.vm b/core/src/main/resources/template/archive/simple/checkboxlist.vm
index 979bc3a679..0f6ead8c96 100644
--- a/core/src/main/resources/template/archive/simple/checkboxlist.vm
+++ b/core/src/main/resources/template/archive/simple/checkboxlist.vm
@@ -37,7 +37,7 @@
         <input type="checkbox" name="$!struts.htmlEncode($parameters.name)" value="$!struts.htmlEncode($itemKey)"
         #parse("/$parameters.templateDir/simple/scripting-events.vm")
         id="$!struts.htmlEncode($parameters.name)-$itemCount" #if( $tag.contains($parameters.nameValue, $itemKey) ) checked="checked" #end />
-        <label for="$!struts.htmlEncode($parameters.name)-$itemCount" class="checkboxLabel">$!struts.htmlEncode($itemValue)</label><br />
+        <label for="$!struts.htmlEncode($parameters.name)-$itemCount" class="struts-checkboxLabel">$!struts.htmlEncode($itemValue)</label><br />
         #set ($trash = $stack.pop())
     #end
 #else
diff --git a/core/src/main/resources/template/archive/xhtml/checkbox.vm b/core/src/main/resources/template/archive/xhtml/checkbox.vm
index 9e772173e4..7052846d41 100644
--- a/core/src/main/resources/template/archive/xhtml/checkbox.vm
+++ b/core/src/main/resources/template/archive/xhtml/checkbox.vm
@@ -33,7 +33,7 @@
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
         <td valign="middle">#parse("$!{tag.templateDir}/simple/checkbox.vm")</td>
-        <td width="100%" valign="middle"><label #if ($parameters.id) for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="checkboxErrorLabel"#else class="checkboxLabel"#end>$!struts.htmlEncode($parameters.label)</label></td>
+        <td width="100%" valign="middle"><label #if ($parameters.id) for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="struts-checkboxErrorLabel"#else class="struts-checkboxLabel"#end>$!struts.htmlEncode($parameters.label)</label></td>
     </tr>
 </table>
 #parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git a/core/src/main/resources/template/archive/xhtml/controlheader.vm b/core/src/main/resources/template/archive/xhtml/controlheader.vm
index a07d787fb1..25cec5b3e0 100644
--- a/core/src/main/resources/template/archive/xhtml/controlheader.vm
+++ b/core/src/main/resources/template/archive/xhtml/controlheader.vm
@@ -31,7 +31,7 @@
 ## if the label position is top,
 ## then give the label it's own row in the table
 <tr>
-#if ($parameters.labelposition && $parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="right" valign="top">#end#if ($parameters.label)<label #if ($parameters.id) for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="errorLabel"#else class="label"#end>#if ($parameters.required)<span class="required">*</span>#end$!struts.htmlEncode($parameters.label):</label>#end</td>
+#if ($parameters.labelposition && $parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="right" valign="top">#end#if ($parameters.label)<label #if ($parameters.id) for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="struts-errorLabel"#else class="label"#end>#if ($parameters.required)<span class="required">*</span>#end$!struts.htmlEncode($parameters.label):</label>#end</td>
 ## add the extra row
 #if ($parameters.labelposition && $parameters.labelposition == 'top')
 </tr>
diff --git a/core/src/main/resources/template/archive/xhtml/form.vm b/core/src/main/resources/template/archive/xhtml/form.vm
index 1beb97e3a8..1f7a35e333 100644
--- a/core/src/main/resources/template/archive/xhtml/form.vm
+++ b/core/src/main/resources/template/archive/xhtml/form.vm
@@ -25,4 +25,4 @@
 <script src="${base}/struts/template/xhtml/validation.js"></script>
 #end
 #parse("/$parameters.templateDir/simple/form.vm")
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
diff --git a/core/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl
index 004f674714..b7e90b8477 100644
--- a/core/src/main/resources/template/css_xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/css_xhtml/checkbox.ftl
@@ -35,7 +35,7 @@ lables
     <#if parameters.id??>
      errorFor="${parameters.id}"<#rt/>
     </#if>
-    class="errorMessage">
+    class="struts-errorMessage">
              ${error?html}
     </div><#t/>
 </#list>
@@ -54,9 +54,9 @@ lables
  for="${parameters.id?html}"<#rt/>
 </#if>
 <#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
+ class="struts-checkboxErrorLabel"<#rt/>
 <#else>
- class="label"<#rt/>
+ class="struts-label"<#rt/>
 </#if>
 >${parameters.label?html}</label><#rt/>
 </span>
@@ -70,7 +70,7 @@ lables
 <#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl">
 
 <#if parameters.required?default(false)>
-        <span class="required">*</span><#t/>
+        <span class="struts-required">*</span><#t/>
 </#if>
 
 <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
@@ -92,9 +92,9 @@ lables
  for="${parameters.id?html}"<#rt/>
 </#if>
 <#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
+ class="struts-checkboxErrorLabel"<#rt/>
 <#else>
- class="checkboxLabel"<#rt/>
+ class="struts-checkboxLabel"<#rt/>
 </#if>
 >${parameters.label?html}</label><#rt/>
 </#if>
diff --git a/core/src/main/resources/template/css_xhtml/controlfooter.ftl b/core/src/main/resources/template/css_xhtml/controlfooter.ftl
index 2783a0ba01..8dc3c2f37c 100644
--- a/core/src/main/resources/template/css_xhtml/controlfooter.ftl
+++ b/core/src/main/resources/template/css_xhtml/controlfooter.ftl
@@ -41,7 +41,7 @@ ${parameters.after?if_exists}<#t/>
     <#if parameters.id??>
      errorFor="${parameters.id}"<#rt/>
     </#if>
-    class="errorMessage">
+    class="struts-errorMessage">
              ${error?html}
     </div><#t/>
 </#list>
diff --git a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
index 2a5c98b55e..9b75a04fdb 100644
--- a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
+++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
@@ -35,7 +35,7 @@
     <#if parameters.id??>
      errorFor="${parameters.id}"<#rt/>
     </#if>
-    class="errorMessage">
+    class="struts-errorMessage">
              ${error?html}
     </div><#t/>
 </#list>
@@ -60,13 +60,13 @@
         for="${parameters.id?html}" <#t/>
 </#if>
 <#if hasFieldErrors>
-        class="errorLabel"<#t/>
+        class="struts-errorLabel"<#t/>
 <#else>
-        class="label"<#t/>
+        class="struts-label"<#t/>
 </#if>
     ><#t/>
 <#if parameters.required?default(false)>
-        <span class="required">*</span><#t/>
+        <span class="struts-required">*</span><#t/>
 </#if>
         ${parameters.label?html}${parameters.labelseparator!":"?html}
 <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl
index 9c3a40af36..5682f541ed 100644
--- a/core/src/main/resources/template/css_xhtml/reset.ftl
+++ b/core/src/main/resources/template/css_xhtml/reset.ftl
@@ -30,7 +30,7 @@
 <#else>
 <span <#rt/>
 </#if>
-    class="formButton"<#t/>
+    class="struts-formButton"<#t/>
 <#if parameters.id??>
     id="wwctrl_${parameters.id}"<#rt/>
 </#if>
diff --git a/core/src/main/resources/template/css_xhtml/styles.css b/core/src/main/resources/template/css_xhtml/styles.css
index 76babfc70c..fe52afa226 100644
--- a/core/src/main/resources/template/css_xhtml/styles.css
+++ b/core/src/main/resources/template/css_xhtml/styles.css
@@ -19,22 +19,22 @@
  * under the License.
  */
 
-.wwFormTable {}
-.label {
+.struts-wwFormTable {}
+.struts-label {
     font-style:italic;
     float:left;
     width:30%
 }
-.errorLabel {font-style:italic; color:red; }
-.errorMessage {font-weight:bold; color:red; }
-.checkboxLabel {}
-.checkboxErrorLabel {color:red; }
-.required {color:red;}
+.struts-errorLabel {font-style:italic; color:red; }
+.struts-errorMessage {font-weight:bold; color:red; }
+.struts-checkboxLabel {}
+.struts-checkboxErrorLabel {color:red; }
+.struts-required {color:red;}
 
-.tdTransferSelect {text-align:center; vertical-align:middle;}
-.tdLabelTop {text-align:left; vertical-align:top;}
-.tdCheckboxLabel {text-align:right; vertical-align:top;}
-.tdCheckboxInput {text-align:left; vertical-align:top;}
-.tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
-.tdErrorMessage {text-align:center; vertical-align:top;}
-.formButton {text-align:right;}
+.struts-tdTransferSelect {text-align:center; vertical-align:middle;}
+.struts-tdLabelTop {text-align:left; vertical-align:top;}
+.struts-tdCheckboxLabel {text-align:right; vertical-align:top;}
+.struts-tdCheckboxInput {text-align:left; vertical-align:top;}
+.struts-tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
+.struts-tdErrorMessage {text-align:center; vertical-align:top;}
+.struts-formButton {text-align:right;}
diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl
index 1611ffb5ff..1e08264ec0 100644
--- a/core/src/main/resources/template/css_xhtml/submit.ftl
+++ b/core/src/main/resources/template/css_xhtml/submit.ftl
@@ -30,7 +30,7 @@
 <#else>
 <span <#rt/>
 </#if>
-    class="formButton"<#t/>
+    class="struts-formButton"<#t/>
 <#if parameters.id??>
     id="wwctrl_${parameters.id}"<#rt/>
 </#if>
diff --git a/core/src/main/resources/template/css_xhtml/validation.js b/core/src/main/resources/template/css_xhtml/validation.js
index 78b442ac53..ecd71d261f 100644
--- a/core/src/main/resources/template/css_xhtml/validation.js
+++ b/core/src/main/resources/template/css_xhtml/validation.js
@@ -54,7 +54,7 @@ function clearErrorLabelsCSS(form) {
     for (i = 0; i < labels.length; i++) {
         var label = labels[i];
         if (label) {
-            if(label.getAttribute("class") === "errorLabel"){
+            if(label.getAttribute("class") === "struts-errorLabel"){
                 label.setAttribute("class", "label");//standard way.. works for ie mozilla
                 label.setAttribute("className", "label"); //ie hack cause ie does not support setAttribute
             }
@@ -130,8 +130,8 @@ function addErrorCSS(e, errorText) {
 
         var label = enclosingDiv.getElementsByTagName("label")[0];
         if (label) {
-            label.setAttribute("class", "errorLabel"); //standard way.. works for ie mozilla
-            label.setAttribute("className", "errorLabel"); //ie hack cause ie does not support setAttribute
+            label.setAttribute("class", "struts-errorLabel"); //standard way.. works for ie mozilla
+            label.setAttribute("className", "struts-errorLabel"); //ie hack cause ie does not support setAttribute
         }
 
         var firstCtrNode = findWWCtrlNode(enclosingDiv); // either wwctrl_ or wwlbl_
@@ -139,8 +139,8 @@ function addErrorCSS(e, errorText) {
         var error = document.createTextNode(errorText);
         var errorDiv = document.createElement("div");
 
-        errorDiv.setAttribute("class", "errorMessage");//standard way.. works for ie mozilla
-        errorDiv.setAttribute("className", "errorMessage");//ie hack cause ie does not support setAttribute
+        errorDiv.setAttribute("class", "struts-errorMessage");//standard way.. works for ie mozilla
+        errorDiv.setAttribute("className", "struts-errorMessage");//ie hack cause ie does not support setAttribute
         errorDiv.setAttribute("errorFor", elem.id);
         errorDiv.appendChild(error);
         if(!firstCtrNode && navigator.appName === 'Microsoft Internet Explorer') {
diff --git a/core/src/main/resources/template/simple/actionerror.ftl b/core/src/main/resources/template/simple/actionerror.ftl
index 6563876d4d..e575a7d9e7 100644
--- a/core/src/main/resources/template/simple/actionerror.ftl
+++ b/core/src/main/resources/template/simple/actionerror.ftl
@@ -28,7 +28,7 @@
 <#if parameters.cssClass??>
  class="${parameters.cssClass?html}"<#rt/>
 <#else>
- class="errorMessage"<#rt/>
+ class="struts-errorMessage"<#rt/>
 </#if>
 <#if parameters.cssStyle??>
  style="${parameters.cssStyle?html}"<#rt/>
diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl
index d50a98fa3b..5aae3d9938 100644
--- a/core/src/main/resources/template/simple/checkboxlist.ftl
+++ b/core/src/main/resources/template/simple/checkboxlist.ftl
@@ -104,7 +104,7 @@
     <#else>
         for="${parameters.name?html}-${itemCount}"<#rt/>
     </#if>
-        class="checkboxLabel">${itemValue?html}</label>
+        class="struts-checkboxLabel">${itemValue?html}</label>
 </@s.iterator>
     <#else>
     &nbsp;
diff --git a/core/src/main/resources/template/simple/fielderror.ftl b/core/src/main/resources/template/simple/fielderror.ftl
index 81e95d9ed9..c8d9d9d3e3 100644
--- a/core/src/main/resources/template/simple/fielderror.ftl
+++ b/core/src/main/resources/template/simple/fielderror.ftl
@@ -40,7 +40,7 @@
                         <#if parameters.cssClass?has_content>
                                 class="${parameters.cssClass?html}"<#rt/>
                             <#else>
-                                class="errorMessage"<#rt/>
+                                class="struts-errorMessage"<#rt/>
                         </#if>
                         <#if parameters.cssStyle?has_content>
                                 style="${parameters.cssStyle?html}"<#rt/>
@@ -64,7 +64,7 @@
             <#if parameters.cssClass?has_content>
                     class="${parameters.cssClass?html}"<#rt/>
                 <#else>
-                    class="errorMessage"<#rt/>
+                    class="struts-errorMessage"<#rt/>
             </#if>
             <#if parameters.cssStyle?has_content>
                     style="${parameters.cssStyle?html}"<#rt/>
diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl
index 44afd6609c..12f8b342ad 100644
--- a/core/src/main/resources/template/simple/inputtransferselect.ftl
+++ b/core/src/main/resources/template/simple/inputtransferselect.ftl
@@ -61,7 +61,7 @@
 
 
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<#assign addLabel=(parameters.addLabel!"->")?html /><#t/>
 	<input type="button"
 		<#if parameters.buttonCssClass?has_content><#t/>
diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl
index c685956815..eda4a7ee41 100644
--- a/core/src/main/resources/template/simple/optiontransferselect.ftl
+++ b/core/src/main/resources/template/simple/optiontransferselect.ftl
@@ -47,7 +47,7 @@
 </#if>
 
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<#if parameters.allowAddToLeft?default(true)><#t/>
 		<#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/>
 		<#if parameters.doubleHeaderKey??><#t/>
diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl
index d845065386..08c5732c4a 100644
--- a/core/src/main/resources/template/xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/xhtml/checkbox.ftl
@@ -28,8 +28,8 @@
  errorFor="${parameters.id}"<#rt/>
 </#if>
 >
-    <td class="tdCheckboxErrorMessage" colspan="2"><#rt/>
-        <span class="errorMessage">${error?html}</span><#t/>
+    <td class="struts-tdCheckboxErrorMessage" colspan="2"><#rt/>
+        <span class="struts-errorMessage">${error?html}</span><#t/>
     </td><#lt/>
 </tr>
 </#list>
@@ -47,17 +47,17 @@
  for="${parameters.id?html}"<#rt/>
 </#if>
 <#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
+ class="struts-checkboxErrorLabel"<#rt/>
 <#else>
- class="checkboxLabel"<#rt/>
+ class="struts-checkboxLabel"<#rt/>
 </#if>
 >
 <#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
-        <span class="required">*</span><#t/>
+        <span class="struts-required">*</span><#t/>
 </#if>
 ${parameters.label?html}<#t/>
 <#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
- <span class="required">*</span><#t/>
+ <span class="struts-required">*</span><#t/>
 </#if>
 :<#t/>
 <#if parameters.tooltip??>
@@ -72,24 +72,24 @@ ${parameters.label?html}<#t/>
         <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
 <#else>
 <tr>
-	<td class="tdCheckboxLabel">
+	<td class="struts-tdCheckboxLabel">
 <#if labelpos?default("") == 'left'>
 <#if parameters.label??> <label<#t/>
 <#if parameters.id??>
  for="${parameters.id?html}"<#rt/>
 </#if>
 <#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
+ class="struts-checkboxErrorLabel"<#rt/>
 <#else>
- class="checkboxLabel"<#rt/>
+ class="struts-checkboxLabel"<#rt/>
 </#if>
 >
 <#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
-        <span class="required">*</span><#t/>
+        <span class="struts-required">*</span><#t/>
 </#if>
 ${parameters.label?html}<#t/>
 <#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
- <span class="required">*</span><#t/>
+ <span class="struts-required">*</span><#t/>
 </#if>
 :<#t/>
 <#if parameters.tooltip??>
@@ -100,14 +100,14 @@ ${parameters.label?html}<#t/>
 </#if>
 <#if labelpos?default("") == 'right'>
     <#if parameters.required?default(false)>
-        <span class="required">*</span><#t/>
+        <span class="struts-required">*</span><#t/>
     </#if>
     <#if parameters.tooltip??>
         <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
     </#if>
 </#if>
     </td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
 
 <#if labelpos?default("") != 'top'>
                 	<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
@@ -118,9 +118,9 @@ ${parameters.label?html}<#t/>
  for="${parameters.id?html}"<#rt/>
 </#if>
 <#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
+ class="struts-checkboxErrorLabel"<#rt/>
 <#else>
- class="checkboxLabel"<#rt/>
+ class="struts-checkboxLabel"<#rt/>
 </#if>
 >${parameters.label?html}</label><#rt/>
 </#if>
diff --git a/core/src/main/resources/template/xhtml/control.ftl b/core/src/main/resources/template/xhtml/control.ftl
index 2761ac3b80..91402b36b8 100644
--- a/core/src/main/resources/template/xhtml/control.ftl
+++ b/core/src/main/resources/template/xhtml/control.ftl
@@ -20,7 +20,7 @@
  * under the License.
  */
 -->
-<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
+<table class="${parameters.cssClass?default('struts-wwFormTable')?html}"<#rt/>
 <#if parameters.cssStyle??> style="${parameters.cssStyle?html}"<#rt/>
 </#if>
 >
\ No newline at end of file
diff --git a/core/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl
index ef3f3caefd..76ef9d0e56 100644
--- a/core/src/main/resources/template/xhtml/controlfooter.ftl
+++ b/core/src/main/resources/template/xhtml/controlfooter.ftl
@@ -28,8 +28,8 @@ ${parameters.after?if_exists}<#t/>
 <#if hasFieldErrors>
 <#list fieldErrors[parameters.name] as error>
 <tr errorFor="${parameters.id}">
-    <td class="tdErrorMessage" colspan="2"><#rt/>
-        <span class="errorMessage">${error?html}</span><#t/>
+    <td class="struts-tdErrorMessage" colspan="2"><#rt/>
+        <span class="struts-errorMessage">${error?html}</span><#t/>
     </td><#lt/>
 </tr>
 </#list>
diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl
index 5835a8434f..61013000d4 100644
--- a/core/src/main/resources/template/xhtml/controlheader-core.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl
@@ -29,8 +29,8 @@
 <#if hasFieldErrors>
 <#list fieldErrors[parameters.name] as error>
 <tr errorFor="${parameters.id}">
-    <td class="tdErrorMessage" colspan="2"><#rt/>
-        <span class="errorMessage">${error?html}</span><#t/>
+    <td class="struts-tdErrorMessage" colspan="2"><#rt/>
+        <span class="struts-errorMessage">${error?html}</span><#t/>
     </td><#lt/>
 </tr>
 </#list>
@@ -47,9 +47,9 @@
 -->
 <tr>
 <#if labelpos?default("") == 'top'>
-    <td class="tdLabelTop" colspan="2"><#rt/>
+    <td class="struts-tdLabelTop" colspan="2"><#rt/>
 <#else>
-    <td class="tdLabel"><#rt/>
+    <td class="struts-tdLabel"><#rt/>
 </#if>
 <#if parameters.label??>
     <label <#t/>
@@ -57,17 +57,17 @@
         for="${parameters.id?html}" <#t/>
 </#if>
 <#if hasFieldErrors>
-        class="errorLabel"<#t/>
+        class="struts-errorLabel"<#t/>
 <#else>
-        class="label"<#t/>
+        class="struts-label"<#t/>
 </#if>
     ><#t/>
 <#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
-        <span class="required">*</span><#t/>
+        <span class="struts-required">*</span><#t/>
 </#if>
 ${parameters.label?html}<#t/>
 <#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
- <span class="required">*</span><#t/>
+ <span class="struts-required">*</span><#t/>
 </#if>
 ${parameters.labelseparator?default(":")?html}<#t/>
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
diff --git a/core/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl
index 7d6121c389..3fd3eb371a 100644
--- a/core/src/main/resources/template/xhtml/reset.ftl
+++ b/core/src/main/resources/template/xhtml/reset.ftl
@@ -21,7 +21,7 @@
  */
 -->
 <tr>
-    <td colspan="2"><div class="formButton"><#t/>
+    <td colspan="2"><div class="struts-formButton"><#t/>
 <#include "/${parameters.templateDir}/simple/reset.ftl" />
 </div><#t/>
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index 91d5171eee..7e8fc123a6 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -19,19 +19,19 @@
  * under the License.
  */
 
-.wwFormTable {}
-.label {font-style:italic; }
-.errorLabel {font-style:italic; color:red; }
-.errorMessage {font-weight:bold; color:red; }
-.checkboxLabel {}
-.checkboxErrorLabel {color:red; }
-.required {color:red;}
-.tdLabel {text-align:right; vertical-align:top; }
+.struts-wwFormTable {}
+.struts-label {font-style:italic; }
+.struts-errorLabel {font-style:italic; color:red; }
+.struts-errorMessage {font-weight:bold; color:red; }
+.struts-checkboxLabel {}
+.struts-checkboxErrorLabel {color:red; }
+.struts-required {color:red;}
+.struts-tdLabel {text-align:right; vertical-align:top; }
 
-.tdTransferSelect {text-align:center; vertical-align:middle;}
-.tdLabelTop {text-align:left; vertical-align:top;}
-.tdCheckboxLabel {text-align:right; vertical-align:top;}
-.tdCheckboxInput {text-align:left; vertical-align:top;}
-.tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
-.tdErrorMessage {text-align:center; vertical-align:top;}
-.formButton {text-align:right;}
+.struts-tdTransferSelect {text-align:center; vertical-align:middle;}
+.struts-tdLabelTop {text-align:left; vertical-align:top;}
+.struts-tdCheckboxLabel {text-align:right; vertical-align:top;}
+.struts-tdCheckboxInput {text-align:left; vertical-align:top;}
+.struts-tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
+.struts-tdErrorMessage {text-align:center; vertical-align:top;}
+.struts-formButton {text-align:right;}
diff --git a/core/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl
index 989e816560..a5c294792f 100644
--- a/core/src/main/resources/template/xhtml/submit.ftl
+++ b/core/src/main/resources/template/xhtml/submit.ftl
@@ -21,5 +21,5 @@
  */
 -->
 <tr>
-    <td colspan="2"><div class="formButton"><#t/>
+    <td colspan="2"><div class="struts-formButton"><#t/>
 <#include "/${parameters.templateDir}/simple/submit.ftl" />
diff --git a/core/src/main/resources/template/xhtml/validation.js b/core/src/main/resources/template/xhtml/validation.js
index feb1a9d143..5600ec87c3 100644
--- a/core/src/main/resources/template/xhtml/validation.js
+++ b/core/src/main/resources/template/xhtml/validation.js
@@ -109,10 +109,10 @@ function addErrorXHTML(e, errorText) {
         var tr = document.createElement("tr");
         var td = document.createElement("td");
         var span = document.createElement("span");
-        td.className = "tdErrorMessage";
+        td.className = "struts-tdErrorMessage";
         td.colSpan = 2;
-        span.setAttribute("class", "errorMessage");
-        span.setAttribute("className", "errorMessage"); //ie hack cause ie does not support setAttribute
+        span.setAttribute("class", "struts-errorMessage");
+        span.setAttribute("className", "struts-errorMessage"); //ie hack cause ie does not support setAttribute
         span.appendChild(error);
         td.appendChild(span);
         tr.appendChild(td);
@@ -124,8 +124,8 @@ function addErrorXHTML(e, errorText) {
         var labelRow = row.cells.length > 1 ? row : StrutsUtils.previousElement(tr, "tr");
         var label = labelRow.cells[0].getElementsByTagName("label")[0];
         if (label) {
-            label.setAttribute("class", "errorLabel");
-            label.setAttribute("className", "errorLabel"); //ie hack cause ie does not support setAttribute
+            label.setAttribute("class", "struts-errorLabel");
+            label.setAttribute("className", "struts-errorLabel"); //ie hack cause ie does not support setAttribute
         }
     } catch (err) {
         alert(err);
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
index 6b467e0615..7115f22cb9 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
@@ -64,7 +64,7 @@ public void testActionErrorsEscape() throws Exception {
         tag.doStartTag();
         tag.doEndTag();
 
-        assertEquals(normalize("<ul class=\"errorMessage\"><li><span>&lt;p&gt;hey&lt;/p&gt;</span></li></ul>", true),
+        assertEquals(normalize("<ul class=\"struts-errorMessage\"><li><span>&lt;p&gt;hey&lt;/p&gt;</span></li></ul>", true),
                 normalize(writer.toString(), true));
     }
 
@@ -80,7 +80,7 @@ public void testActionErrorsDontEscape() throws Exception {
         tag.doStartTag();
         tag.doEndTag();
 
-        assertEquals(normalize("<ul class=\"errorMessage\"><li><span><p>hey</p></span></li></ul>", true),
+        assertEquals(normalize("<ul class=\"struts-errorMessage\"><li><span><p>hey</p></span></li></ul>", true),
                 normalize(writer.toString(), true));
     }
 
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
index 50f5cb72c4..fb5a33dcb2 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
@@ -73,7 +73,7 @@ public void testFieldErrorsEscape() throws Exception {
         tag.doStartTag();
         tag.doEndTag();
 
-        assertEquals(normalize("<ul class=\"errorMessage\"><li><span>&lt;p&gt;hey&lt;/p&gt;</span></li></ul>", true),
+        assertEquals(normalize("<ul class=\"struts-errorMessage\"><li><span>&lt;p&gt;hey&lt;/p&gt;</span></li></ul>", true),
                 normalize(writer.toString(), true));
     }
 
@@ -89,7 +89,7 @@ public void testFieldErrorsDontEscape() throws Exception {
         tag.doStartTag();
         tag.doEndTag();
 
-        assertEquals(normalize("<ul class=\"errorMessage\"><li><span><p>hey</p></span></li></ul>", true),
+        assertEquals(normalize("<ul class=\"struts-errorMessage\"><li><span><p>hey</p></span></li></ul>", true),
                 normalize(writer.toString(), true));
     }
 
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
index b746088d27..b8dfc96724 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
@@ -1,9 +1,9 @@
 <tr>
-	<td class="tdCheckboxLabel">
+	<td class="struts-tdCheckboxLabel">
 	</td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
 		<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
 		<input type="hidden" id="__checkbox_someId" name="__checkbox_foo" value="baz"/>
-        <label for="someId" class="checkboxLabel">mylabel</label>
+        <label for="someId" class="struts-checkboxLabel">mylabel</label>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
index caf46327b7..ad18866591 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
@@ -1,9 +1,9 @@
 <tr>
-	<td class="tdCheckboxLabel">
+	<td class="struts-tdCheckboxLabel">
 	</td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
         <input type="checkbox" name="foo" value="baz" id="foo" title="mytitle"/>
         <input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
-        <label for="foo" class="checkboxLabel">mylabel</label>
+        <label for="foo" class="struts-checkboxLabel">mylabel</label>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
index 68b91f3235..d59b73c705 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
@@ -1,16 +1,16 @@
 <tr errorFor="foo">
-    <td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
+    <td class="struts-tdCheckboxErrorMessage" colspan="2"><span class="struts-errorMessage">Some Foo Error</span></td>
 </tr>
 <tr errorFor="foo">
-    <td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
+    <td class="struts-tdCheckboxErrorMessage" colspan="2"><span class="struts-errorMessage">Another Foo Error</span></td>
 </tr>
 <tr>
-	<td class="tdCheckboxLabel">
+	<td class="struts-tdCheckboxLabel">
 	
 	</td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
           <input type="checkbox" name="foo" value="baz" checked="checked" id="foo" class="myErrorClass" title="mytitle" onclick="test();" ondblclick="test();"/>
           <input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
-          <label for="foo" class="checkboxErrorLabel">mylabel</label>
+          <label for="foo" class="struts-checkboxErrorLabel">mylabel</label>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt
index ef05dc427c..36a2b105fd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt
@@ -1,16 +1,16 @@
 <tr errorFor="foo">
-    <td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
+    <td class="struts-tdCheckboxErrorMessage" colspan="2"><span class="struts-errorMessage">Some Foo Error</span></td>
 </tr>
 <tr errorFor="foo">
-    <td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
+    <td class="struts-tdCheckboxErrorMessage" colspan="2"><span class="struts-errorMessage">Another Foo Error</span></td>
 </tr>
 <tr>
-	<td class="tdCheckboxLabel">
+	<td class="struts-tdCheckboxLabel">
 	
 	</td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
           <input type="checkbox" name="foo" value="baz" checked="checked" id="foo" style="color:red" title="mytitle" onclick="test();" ondblclick="test();"/>
           <input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
-          <label for="foo" class="checkboxErrorLabel">mylabel</label>
+          <label for="foo" class="struts-checkboxErrorLabel">mylabel</label>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt
index 6cf1f955a1..2064cd7683 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt
@@ -1,6 +1,6 @@
 <tr>
     <td colspan="2">
-        <label for="someId" class="checkboxLabel">mylabel:</label>
+        <label for="someId" class="struts-checkboxLabel">mylabel:</label>
     </td>
 </tr>
 <tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt
index 49e093cae4..ed9c6ccf8c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt
@@ -1,8 +1,8 @@
 <tr>
-	<td class="tdCheckboxLabel">
-	    <label for="someId" class="checkboxLabel">mylabel:</label>
+	<td class="struts-tdCheckboxLabel">
+	    <label for="someId" class="struts-checkboxLabel">mylabel:</label>
 	</td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
 		<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
 		<input type="hidden" id="__checkbox_someId" name="__checkbox_foo" value="baz"/>
     </td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt
index c54c8629ad..6d14c1ffa5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt
@@ -1,9 +1,9 @@
 <tr>
-	<td class="tdCheckboxLabel">
+	<td class="struts-tdCheckboxLabel">
 	</td>
-    <td class="tdCheckboxInput">
+    <td class="struts-tdCheckboxInput">
 		<input type="checkbox" name="foo" value="baz" checked="checked" disabled="disabled" id="foo" title="mytitle" />
 		<input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz" disabled="disabled"/>
-		<label for="foo" class="checkboxLabel">mylabel</label>
+		<label for="foo" class="struts-checkboxLabel">mylabel</label>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
index 0458cea2a0..f1d21dbe11 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
@@ -1,12 +1,12 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td>
 <input type="checkbox" name="foo" value="hello" id="foo-1" checked="checked" title="mytitle" onchange="alert('foo');"/>
-<label for="foo-1" class="checkboxLabel">world</label>
+<label for="foo-1" class="struts-checkboxLabel">world</label>
 <input type="checkbox" name="foo" value="foo" id="foo-2" title="mytitle" onchange="alert('foo');"/>
-<label for="foo-2" class="checkboxLabel">bar</label>
+<label for="foo-2" class="struts-checkboxLabel">bar</label>
 <input type="checkbox" name="foo" value="baz" id="foo-3" title="mytitle" onchange="alert('foo');"/>
-<label for="foo-3" class="checkboxLabel"></label>
+<label for="foo-3" class="struts-checkboxLabel"></label>
 <input type="hidden" id="__multiselect_foo" name="__multiselect_foo" value=""/>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt
index abdaa44148..fb6562343b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt
@@ -1,12 +1,12 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">mylabel:</label></td>
     <td>
 <input type="checkbox" name="collection" value="hello" id="collection-1" checked="checked"/>
-<label for="collection-1" class="checkboxLabel">world</label>
+<label for="collection-1" class="struts-checkboxLabel">world</label>
 <input type="checkbox" name="collection" value="foo" id="collection-2" checked="checked"/>
-<label for="collection-2" class="checkboxLabel">bar</label>
+<label for="collection-2" class="struts-checkboxLabel">bar</label>
 <input type="checkbox" name="collection" value="cat" id="collection-3"/>
-<label for="collection-3" class="checkboxLabel">dog</label>
+<label for="collection-3" class="struts-checkboxLabel">dog</label>
 <input type="hidden" id="__multiselect_collection" name="__multiselect_collection" value=""/>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt
index 5fe2bf5840..8ce95e6a08 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt
@@ -1,12 +1,12 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">mylabel:</label></td>
     <td>
 <input type="checkbox" name="collection" value="hello" id="collection-1" checked="checked" disabled="disabled"/>
-<label for="collection-1" class="checkboxLabel">world</label>
+<label for="collection-1" class="struts-checkboxLabel">world</label>
 <input type="checkbox" name="collection" value="foo" id="collection-2" checked="checked" disabled="disabled"/>
-<label for="collection-2" class="checkboxLabel">bar</label>
+<label for="collection-2" class="struts-checkboxLabel">bar</label>
 <input type="checkbox" name="collection" value="cat" id="collection-3" disabled="disabled"/>
-<label for="collection-3" class="checkboxLabel">dog</label>
+<label for="collection-3" class="struts-checkboxLabel">dog</label>
 <input type="hidden" id="__multiselect_collection" name="__multiselect_collection" value="" disabled="disabled"/>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt
index 3ba9c42d7f..18f16457be 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt
@@ -1,10 +1,10 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td>
 <input type="checkbox" name="foo" value="hello" id="foo-1" checked="checked" disabled="disabled" onchange="alert('foo');"/>
-<label for="foo-1" class="checkboxLabel">world</label>
+<label for="foo-1" class="struts-checkboxLabel">world</label>
 <input type="checkbox" name="foo" value="foo" id="foo-2" disabled="disabled" onchange="alert('foo');"/>
-<label for="foo-2" class="checkboxLabel">bar</label>
+<label for="foo-2" class="struts-checkboxLabel">bar</label>
 <input type="hidden" id="__multiselect_foo" name="__multiselect_foo" value="" disabled="disabled"/>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
index 1c416a598d..17434d2390 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="cb" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="cb" class="struts-label">mylabel:</label></td>
     <td>
 <script type="text/javascript">
 	function autoPopulate_cb(targetElement) {
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
index f7cc3b2645..9cc7313e79 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myFavouriteFruit" class="label">My Favourite Fruit:</label></td>
+    <td class="struts-tdLabel"><label for="myFavouriteFruit" class="struts-label">My Favourite Fruit:</label></td>
     <td>
 <script type="text/javascript">
 	function autoPopulate_myFavouriteFruit(targetElement) {
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
index f7cc3b2645..9cc7313e79 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myFavouriteFruit" class="label">My Favourite Fruit:</label></td>
+    <td class="struts-tdLabel"><label for="myFavouriteFruit" class="struts-label">My Favourite Fruit:</label></td>
     <td>
 <script type="text/javascript">
 	function autoPopulate_myFavouriteFruit(targetElement) {
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
index 2ccd24e0c4..004794d22a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
@@ -1,5 +1,5 @@
  <tr>
-     <td class="tdLabel"><label for="cb.bc" class="label">mylabel:</label></td>
+     <td class="struts-tdLabel"><label for="cb.bc" class="struts-label">mylabel:</label></td>
      <td>
  <script type="text/javascript">
     function autoPopulate_cb_bc(targetElement) {
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt
index d436237cb9..851f604dd2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt
@@ -1,6 +1,6 @@
 <tr>
-	<td class="tdLabel">
-		<label for="myFooValue" class="label">mylabel:</label>
+	<td class="struts-tdLabel">
+		<label for="myFooValue" class="struts-label">mylabel:</label>
 	</td>
 	<td>
 		<input type="text" name="myname" value="foo" id="myFooValue"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt
index d6f06421ca..67cc3f9d5e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt
@@ -1,6 +1,6 @@
 <tr>
-	<td class="tdLabel">
-		<label for="foo" class="label">mylabel:</label>
+	<td class="struts-tdLabel">
+		<label for="foo" class="struts-label">mylabel:</label>
 	</td>
 	<td>
 		<input type="text" name="myname" value="foo" id="foo"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
index e536c560b6..cbd7f7a5bd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td>
 <select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
index 87fa10dc86..1a8b9b1036 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td>
 <select name="foo" id="foo" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
index 69f0923bb5..4518b496dd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo_bar" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo_bar" class="struts-label">mylabel:</label></td>
     <td>
 <select name="foo.bar" id="foo_bar" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="foo_barRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
index 74cde90ac5..04363429b8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td>
 <select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex);window.status='onchange';">
     <option value="BE">Belgium</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt
index 206f4d9096..dd298871e2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td><input type="file" name="myname" size="10" value="" accept="*.txt" id="myname" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
index 8bd3a47df5..772cf33e35 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
@@ -1,4 +1,4 @@
 <form id="myid" name="myForm" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
index 666f5cf540..34781c6a4b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
@@ -1,4 +1,4 @@
 <form id="testNamespaceAction" name="myForm" onsubmit="submitMe()" action="/testNamespace/testNamespaceAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index e64dc79a39..6a2e11de9d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -1,8 +1,8 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript" src="/struts/utils.js"></script>
 <form id="testAction" name="myForm" onsubmit="submitMe(); return validateForm_testAction();" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
-<table class="wwFormTable"> <tr>
-    <td class="tdLabel"></td>
+<table class="struts-wwFormTable"> <tr>
+    <td class="struts-tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
index 2fcdd8a8fa..d881948ef9 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt
@@ -1,5 +1,5 @@
 <form id="testAction" name="testAction" action="/testAction.action" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
 
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-13.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-13.txt
index 418ab66cc3..2a876bd540 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-13.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-13.txt
@@ -1,4 +1,4 @@
 <form id="testAction" name="testAction" action="/testNamespace/testAction.action" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-14.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-14.txt
index 842c9d8968..af55406e90 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-14.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-14.txt
@@ -1,4 +1,4 @@
 <form id="testAction" name="testAction" action="/testAction.action" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index 8cd21021ec..7b31cc6087 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -1,8 +1,8 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript "src="/struts/utils.js"></script>
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
-<table class="wwFormTable"> <tr>
-    <td class="tdLabel"></td>
+<table class="struts-wwFormTable"> <tr>
+    <td class="struts-tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
index ab2a1ee586..7eb92e9e4a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
@@ -1,8 +1,8 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript "src="/struts/utils.js"></script>
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
-<table class="wwFormTable"> <tr>
-    <td class="tdLabel"></td>
+<table class="struts-wwFormTable"> <tr>
+    <td class="struts-tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-23.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-23.txt
index 250bc678a3..b6fe439bf4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-23.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-23.txt
@@ -1,4 +1,4 @@
 <form id="testAction" name="myForm" onsubmit="submitMe()" action="/testAction!testMethod.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
index afbd0491dd..31c13235d0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
@@ -1,8 +1,8 @@
 <script type="text/javascript" src="/struts/xhtml/validation.js"></script>
 <script type="text/javascript "src="/struts/utils.js"></script>
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
-<table class="wwFormTable"> <tr>
-    <td class="tdLabel"></td>
+<table class="struts-wwFormTable"> <tr>
+    <td class="struts-tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-25.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-25.txt
index 26a8276642..68dc4ef0e2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-25.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-25.txt
@@ -1,4 +1,4 @@
 <form id="myAction" name="myAction" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-26.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-26.txt
index bb9d66a228..c6549f1767 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-26.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-26.txt
@@ -1 +1 @@
-<formid="testAction"name="myForm"onsubmit="submitMe()"action="/testAction.action?paramone=one&amp;paramtwo=two"method="post"enctype="myEncType"title="mytitle"accept-charset="UTF-8"><tableclass="wwFormTable"></table></form>
\ No newline at end of file
+<formid="testAction"name="myForm"onsubmit="submitMe()"action="/testAction.action?paramone=one&amp;paramtwo=two"method="post"enctype="myEncType"title="mytitle"accept-charset="UTF-8"><tableclass="struts-wwFormTable"></table></form>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
index a9b92445ca..d513c83a07 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
@@ -1,7 +1,7 @@
 <form id="testAction" name="testAction" action="/testAction.action" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
     <tr>
-        <td class="tdLabelTop" colspan="2"><label class="label">label:</label></td>
+        <td class="struts-tdLabelTop" colspan="2"><label class="struts-label">label:</label></td>
     </tr>
     <tr>
         <td><input type="text" name=""/></td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-28.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-28.txt
index 70f3e06c5d..decb18e23b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-28.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-28.txt
@@ -1,7 +1,7 @@
 <form id="testAction" name="testAction" action="/testAction.action" method="post">
 <div class="wwgrp">
     <div class="wwlbl">
-        <label class="label">label:</label>
+        <label class="struts-label">label:</label>
     </div><br />
     <div class="wwctrl">
         <input type="text" name=""/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
index 790d1ec20b..e0f021e185 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
@@ -1,4 +1,4 @@
 <form id="testNamespaceAction" name="myForm" action="/testNamespace/testNamespaceAction.action" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
index 35c1895d74..75846d1eed 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
@@ -1,4 +1,4 @@
 <form id="foo" name="foo" action="/foo.jsp" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
index 68fde68bc2..7c00ddfa20 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
@@ -1,4 +1,4 @@
 <form id="testNamespaceAction" name="myForm" action="/testNamespace/testNamespaceAction.jspa" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
index 3487b33703..c17cec7ad3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
@@ -1,6 +1,6 @@
 <form id="myAction" name="myForm" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle">
-<table class="wwFormTable"> <tr>
-    <td class="tdLabel"></td>
+<table class="struts-wwFormTable"> <tr>
+    <td class="struts-tdLabel"></td>
     <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
index 0fb96c8757..4cea239463 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
@@ -1,4 +1,4 @@
 <form id="test" name="test" action="test.html" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
index 68fde68bc2..7c00ddfa20 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
@@ -1,4 +1,4 @@
 <form id="testNamespaceAction" name="myForm" action="/testNamespace/testNamespaceAction.jspa" method="post">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
index 81b9754f2e..45ffdd1915 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
@@ -1,4 +1,4 @@
 <form id="testAction" name="myForm" onsubmit="submitMe()" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
-<table class="wwFormTable">
+<table class="struts-wwFormTable">
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt
index f96bc1c4a1..ddfdba5269 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td><label id="myname" title="mytitle">bar</label></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt
index f4859443c9..6ebc01436a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="foo2" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo2" class="struts-label">mylabel:</label></td>
     <td><label id="foo2" for="for">baz</label></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt
index d66737f62d..ce02a0dc09 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabelTop" colspan="2"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabelTop" colspan="2"><label for="myname" class="struts-label">mylabel:</label></td>
 </tr>
 <tr>
     <td><label id="myname">bar</label></td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt
index b190ae5238..82af84d72c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td><label id="foo" for="for">output</label></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt
index 17addde782..b0f1db3efa 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td><label id="foo" for="for">baz</label></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt
index 6865d239d2..7928d8afd2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection">
     <option value="ONE">one</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt
index b8e105e42e..ffc15c348d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection">
     <option value="ONE">one</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt
index 20d52aab5f..7ccb16af5e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection" multiple="multiple">
     <option value="ONE">one</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
index 27ced4c214..f26dfe7482 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection">
     <option value="ONE">one</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt
index 7000959850..665c2f807b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection" multiple="multiple">
     <option value="ONE">one</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
index 99ed29753e..907df02bb7 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection">
     <option value="ONE">Edno</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt
index 9a31727352..fa3b1f1bd8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
+    <td class="struts-tdLabel"><label for="mySelection" class="struts-label">My Selection:</label></td>
     <td>
 <select name="mySelection" id="mySelection" multiple="multiple">
     <option value="1">one</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt
index be4c1e0f6c..774b2c655e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td><input type="password" name="myname" id="myname" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
index 0a42dea3da..48613e6705 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td>
 <input type="radio" name="myname" id="mynamehello" value="hello"/><label for="mynamehello">world</label>
 <input type="radio" name="myname" id="mynamefoo" value="foo"/><label for="mynamefoo">bar</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt
index aa82dff9a8..4623bde132 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td>
 <input type="radio" name="myname" id="myname2" value="2"/><label for="myname2">Two</label>
 <input type="radio" name="myname" id="myname1" checked="checked" value="1"/><label for="myname1">One</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt
index 746e04467d..3f0bcba5df 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td>
 <input type="radio" name="myname" id="mynametrue" checked="checked" value="true"/><label for="mynametrue">male</label>
 <input type="radio" name="myname" id="mynamefalse" value="false"/><label for="mynamefalse">female</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
index 1ac889aa53..510c604d95 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td>
 <input type="radio" name="myname" id="myname" checked="checked" value=""/><label for="myname">N/A</label>
 <input type="radio" name="myname" id="myname1" value="1"/><label for="myname1">One</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
index ca0e82e088..ed2e56d114 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel--</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel--</label></td>
     <td>
 <input type="radio" name="myname" id="mynamehello" value="hello"/><label for="mynamehello">world</label>
 <input type="radio" name="myname" id="mynamefoo" value="foo"/><label for="mynamefoo">bar</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
index d58184796a..0e4d07c47c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"></td>
+    <td class="struts-tdLabel"></td>
     <td>
         <input type="radio" name="myMap['name']" id="myMap_'name'_"value=""/>
         <label for="myMap_'name'_">N/A</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt
index b1f903e0f1..5cea2c90f5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td>
         <input type="radio" name="myname" id="mynamehello" value="hello" dojo="checked:hello"/><label for="mynamehello">world</label>
         <input type="radio" name="myname" id="mynamefoo" value="foo" dojo="checked:foo"/><label for="mynamefoo">bar</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
index 699faf7013..8306e0a714 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="reset" name="myname" value="bar"/></div></td>
+    <td colspan="2"><div class="struts-formButton"><input type="reset" name="myname" value="bar"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
index 2344fec7ae..727d317299 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
+    <td colspan="2"><div class="struts-formButton"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
index a9f63c05f5..ccfa4e8b04 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar">bar</button></div></td>
+    <td colspan="2"><div class="struts-formButton"><button type="reset" name="myname" value="bar">bar</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
index 31707b3269..d87ae135ca 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
+    <td colspan="2"><div class="struts-formButton"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
index c94fd1d94e..641d740535 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
+    <td colspan="2"><div class="struts-formButton"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
index 6e1526bf67..19b838246f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
+    <td colspan="2"><div class="struts-formButton"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt
index 7bf1ba537e..b0a0eb6540 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td><select name="foo" id="foo">
     <option value="headerKey">headerValue</option>
     <option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt
index ddef927b40..7114b3b25f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">mylabel:</label></td>
     <td><select name="collection" id="collection" title="mytitle" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="1" selected="selected">hello</option>
     <option value="2" selected="selected">foo</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt
index 09aad69f1a..389deefe76 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="fooInt" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="fooInt" class="struts-label">mylabel:</label></td>
     <td><select name="fooInt" id="fooInt">
     <option value="headerKey">headerValue</option>
     <option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
index be3be8ca33..15d55fabc4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">mylabel:</label></td>
     <td><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="1" selected="selected">foo</option>
     <option value="2">bar</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
index 9101514163..3279e0bfac 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="status" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="status" class="struts-label">mylabel:</label></td>
     <td><select name="status" id="status">
     <option value="INIT">init</option>
     <option value="COMPLETED" selected="selected">completed</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt
index 50b96bb3c2..cfde78f522 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">mylabel:</label></td>
     <td><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="hello" selected="selected">world</option>
     <option value="foo" selected="selected">bar</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt
index 7c3cfef11a..2f543cbf67 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">mylabel:</label></td>
     <td><select name="collection" id="collection" title="mytitle" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="hello" selected="selected">1</option>
     <option value="foo" selected="selected">2</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt
index 93e929facf..d986311caa 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="collection" class="label">tmjee_name:</label></td>
+    <td class="struts-tdLabel"><label for="collection" class="struts-label">tmjee_name:</label></td>
     <td><select name="collection" id="collection">
 </select></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt
index 5766f391dd..62f595d980 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myId" class="label">media1:</label></td>
+    <td class="struts-tdLabel"><label for="myId" class="struts-label">media1:</label></td>
     <td><select name="myName" id="myId" multiple="multiple">
     <option value=""></option>
     <option value="aaa">aaa</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt
index bc216c4db8..5016b47179 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="myId" class="label">media2:</label></td>
+    <td class="struts-tdLabel"><label for="myId" class="struts-label">media2:</label></td>
     <td><select name="myName" id="myId">
     <option value=""></option>
     <option value="aaa">aaa</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt
index d3688f2e50..e25e33cdbd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td><select name="foo" id="foo">
     <option value="headerKey">hello: headerValue</option>
     <option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
index b858072a3c..f50d041f3f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
@@ -1,5 +1,5 @@
 <tr>
-<td class="tdLabel"><label for="myPet" class="label">myLabel:</label></td>
+<td class="struts-tdLabel"><label for="myPet" class="struts-label">myLabel:</label></td>
 <td>
 <select name="myPet" id="myPet">
     <option value="-1" selected="selected">--- Please Select ---</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
index 68e4d8ceab..1d7c78c670 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td><select name="foo" id="foo">
     <option value="headerKey">headerValue</option>
     <option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
index ef5882ccbe..80dcb66715 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
+    <td colspan="2"><div class="struts-formButton"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
index 36b1554f55..1af5bb80a0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
+    <td colspan="2"><div class="struts-formButton"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
index 92fed2bd2b..693522db60 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1">bar</button></div></td>
+    <td colspan="2"><div class="struts-formButton"><button type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1">bar</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt
index c70f19f080..5224430189 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="submit" id="myname" name="myname" value="bar">mylabel</button></div></td>
+    <td colspan="2"><div class="struts-formButton"><button type="submit" id="myname" name="myname" value="bar">mylabel</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
index d83c44fcf0..a6bfa013e8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
+    <td colspan="2"><div class="struts-formButton"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
index 9cd5d0246d..d7bdd696c3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
+    <td colspan="2"><div class="struts-formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt
index 5c38c5b3ef..0c3218b732 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="the_id" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="the_id" class="struts-label">mylabel:</label></td>
     <td><textarea name="myname" cols="20" rows="30" disabled="disabled" readonly="readonly" tabindex="5" id="the_id" title="mytitle" onclick="alert('onclick');" onkeyup="alert('hello');" onchange="alert('goodbye');">bar</textarea></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt
index 40dfacf63e..4c8ccf2f25 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td><input type="text" name="myname" size="10" value="bar" id="myname"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-10.txt
index 448048fa20..e65f800639 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-10.txt
@@ -1,12 +1,12 @@
 <div id="wwgrp_myId" class="wwgrp">
     <div id="wwlbl_myId" class="wwlbl">
-        <label for="myId" class="errorLabel">mylabel:</label>
+        <label for="myId" class="struts-errorLabel">mylabel:</label>
     </div>
     <br/>
     <div id="wwctrl_myId" class="wwctrl">
         <input type="text" name="foo" value="bar" id="myId" title="mytitle"/>
     </div>
     <div id="wwerr_myId" class="wwerr">
-        <div errorFor="myId" class="errorMessage">barerrormessage</div>
+        <div errorFor="myId" class="struts-errorMessage">barerrormessage</div>
     </div>
 </div>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-11.txt
index 4687d5355b..8fc4bacf43 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-11.txt
@@ -1,9 +1,9 @@
 <div id="wwgrp_myId" class="wwgrp">
     <div id="wwerr_myId" class="wwerr">
-        <div errorFor="myId" class="errorMessage">barerrormessage</div>
+        <div errorFor="myId" class="struts-errorMessage">barerrormessage</div>
     </div>
     <div id="wwlbl_myId" class="wwlbl">
-        <label for="myId" class="errorLabel">mylabel:</label>
+        <label for="myId" class="struts-errorLabel">mylabel:</label>
     </div>
     <br/>
     <div id="wwctrl_myId" class="wwctrl">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt
index fc370890b7..cf4c4ae66a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt
@@ -1,7 +1,7 @@
 <tr errorFor="myId">
-    <td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
+    <td class="struts-tdErrorMessage" colspan="2"><span class="struts-errorMessage">bar error message</span></td>
 </tr>
 <tr>
-    <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myId" class="struts-errorLabel">mylabel:</label></td>
     <td><input type="text" name="foo" value="bar" id="myId" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt
index c90ae3687a..fcfa6921cc 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"></td>
+    <td class="struts-tdLabel"></td>
     <td><input type="text" name="myname" size="10" value="bar" id="myname" onblur="blahescape('somevalue');"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt
index cb24f04eee..0619a8db74 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt
@@ -1,6 +1,6 @@
 <tr>
-    <td class="tdLabel">
-        <label for="myname" class="label">label??</label>
+    <td class="struts-tdLabel">
+        <label for="myname" class="struts-label">label??</label>
     </td>
     <td><input type="text" name="myname" size="10" value="bar" id="myname" onblur="blahescape('somevalue');"/></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
index 5dfc6245e8..f684d0665a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myname" class="struts-label">mylabel:</label></td>
     <td><input type="text" name="myname" size="10" value="%{1+1}" id="myname"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
index e6ecb5cec6..d081d36759 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">mylabel:</label></td>
     <td><input type="text" name="foo" size="10" value="%{1+1}" id="foo"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt
index 45d4ffba82..a2a85cfe94 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt
@@ -1,4 +1,4 @@
 <tr>
-    <td class="tdLabel"><label for="foo" class="label">myemaillabel:</label></td>
+    <td class="struts-tdLabel"><label for="foo" class="struts-label">myemaillabel:</label></td>
     <td><input type="email" name="foo" size="50" value="bar" id="foo"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt
index b3e3addc91..c495b93686 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt
@@ -1,13 +1,13 @@
 <tr>
-    <td class="tdLabel">
-        <label for="myId" class="errorLabel">mylabel:</label>
+    <td class="struts-tdLabel">
+        <label for="myId" class="struts-errorLabel">mylabel:</label>
     </td>
     <td>
         <input type="text" name="foo" value="bar" id="myId" title="mytitle"/>
     </td>
 </tr>
 <tr errorFor="myId">
-    <td class="tdErrorMessage" colspan="2">
-        <span class="errorMessage">barerrormessage</span>
+    <td class="struts-tdErrorMessage" colspan="2">
+        <span class="struts-errorMessage">barerrormessage</span>
     </td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt
index a0cb054490..12411f4334 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt
@@ -1,11 +1,11 @@
 <tr errorFor="myId">
-    <td class="tdErrorMessage" colspan="2">
-        <span class="errorMessage">barerrormessage</span>
+    <td class="struts-tdErrorMessage" colspan="2">
+        <span class="struts-errorMessage">barerrormessage</span>
     </td>
 </tr>
 <tr>
-    <td class="tdLabel">
-        <labelfor="myId" class="errorLabel">mylabel:</label>
+    <td class="struts-tdLabel">
+        <labelfor="myId" class="struts-errorLabel">mylabel:</label>
     </td>
     <td>
         <input type="text" name="foo" value="bar" id="myId" title="mytitle"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
index 27d1834636..bf7cf55ae4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
@@ -1,4 +1,4 @@
-<ul id="someid" class="errorMessage">
+<ul id="someid" class="struts-errorMessage">
 	<li><span>action error number 1</span></li>
 	<li><span>action error number 2</span></li>
 	<li><span>action error number 3</span></li>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
index eeb5239f71..6781eb5f7c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
@@ -1,4 +1,4 @@
-<ul class="errorMessage">
+<ul class="struts-errorMessage">
 	<li><span>field error message number 1</span></li>
 	<li><span>field error message number 2</span></li>
 	<li><span>field error message number 3</span></li>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
index af4f93104e..f1e829edf2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
@@ -1,4 +1,4 @@
-<ul id="someid" class="errorMessage">
+<ul id="someid" class="struts-errorMessage">
 	<li><span>field error message number 1</span></li>
 	<li><span>field error message number 3</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
index 77f669c172..65c74b58a5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
@@ -1,4 +1,4 @@
-<ul class="errorMessage">
+<ul class="struts-errorMessage">
 	<li><span>field error message number 1</span></li>
 	<li><span>field error message number 2</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
index 2c3d42a093..7c568c2fa8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
@@ -1,3 +1,3 @@
-<ul class="errorMessage">
+<ul class="struts-errorMessage">
 	<li><span>field error message number 2</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
index 005578301e..288d7eda8d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
@@ -1,3 +1,3 @@
-<ul class="errorMessage">
+<ul class="struts-errorMessage">
 	<li><span>field error message number 1</span></li>
 </ul>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
index 47324f3471..6dbadc5983 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
@@ -1,10 +1,10 @@
 <tr>
-  <tdclass="tdLabel"></td>
+  <tdclass="struts-tdLabel"></td>
   <td>
   <script type="text/javascript" src="/struts/inputtransferselect.js"></script>
   <table>
   <tr><td><input type="text" name="collection_input" id="collection_input"/></td>
-      <td class="tdTransferSelect"><inputtype="button"value="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
+      <td class="struts-tdTransferSelect"><inputtype="button"value="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
       <br/><br/>
       <input type="button"value="&lt;-"onclick="removeOptions(document.getElementById('collection'))"/>
       <br/><br/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
index be8fd8fced..894eb191e8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td> 
+<td class="struts-tdLabel"></td> 
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -16,7 +16,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt
index 3e3642190e..53cfec31f7 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td>
+<td class="struts-tdLabel"></td>
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
index a7905457bf..ef6253745a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td>
+<td class="struts-tdLabel"></td>
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -16,7 +16,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', '');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', '');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
index 4454ed2f92..9042c0f85f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td>
+<td class="struts-tdLabel"></td>
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt
index cbcde657c6..476c06afbf 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td> 
+<td class="struts-tdLabel"></td> 
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -16,7 +16,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
index 68f689b7bd..ed56d9f002 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td>
+<td class="struts-tdLabel"></td>
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
index 75f5aaf4cd..e0bdf4e905 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
@@ -1,5 +1,5 @@
 <tr> 
-<td class="tdLabel"></td>
+<td class="struts-tdLabel"></td>
 <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td class="tdTransferSelect">
+<td class="struts-tdTransferSelect">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');alert('Moving Left');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
index 7701269ab3..0e5d59c4c1 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
@@ -1,8 +1,8 @@
 <form id="myFormId" name="myForm" action="/testAction.action" method="post">
-	<tableclass="wwFormTable">
+	<tableclass="struts-wwFormTable">
 		<tr>
-			<td class="tdLabel">
-				<labelfor="myId"class="label">
+			<td class="struts-tdLabel">
+				<labelfor="myId"class="struts-label">
 					MyLabel:<img
 								src='/struts/tooltip/myTooltip.gif'
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
index 8c7d2fe327..67bc08b74f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
@@ -1,8 +1,8 @@
 <form id="myFormId" name="myForm" action="/testAction.action" method="post">
-	<tableclass="wwFormTable">
+	<tableclass="struts-wwFormTable">
 		<tr>
-			<td class="tdLabel">
-				<labelfor="myId"class="label">
+			<td class="struts-tdLabel">
+				<labelfor="myId"class="struts-label">
 					MyLabel:<img
 								src='/struts/tooltip/myTooltip.gif'
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
index a8871b6a68..94c2a43ff4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
@@ -1,8 +1,8 @@
 <form id="myFormId" name="myForm" action="/testAction.action" method="post">
- <tableclass="wwFormTable">
+ <tableclass="struts-wwFormTable">
 		<tr>
-			<td class="tdLabel">
-				<labelfor="myId"class="label">
+			<td class="struts-tdLabel">
+				<labelfor="myId"class="struts-label">
 					MyLabel:<img
 								src='/struts/tooltip/myTooltip2.gif'
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','5000','styleClass','StrutsTTClassic')"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt
index 36cb71127c..bffa2bcc68 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt
@@ -1,8 +1,8 @@
 <form id="myFormId" name="myForm" action="/testAction.action" method="post">
-	<tableclass="wwFormTable">
+	<tableclass="struts-wwFormTable">
 		<tr>
-			<td class="tdLabel">
-				<labelfor="myId"class="label">
+			<td class="struts-tdLabel">
+				<labelfor="myId"class="struts-label">
 					MyLabel:<img
 								src='/struts/tooltip/myTooltip.gif'
 								title="myTooltip" alt="myTooltip" />
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
index 1781a6edc6..f65130481a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
index 02dc6af745..5d50a4ef09 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
index cbcb6da1e8..771efc20d5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
index 8409926825..1f5f98aca8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
index 6882b436d8..8c560a06ea 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
index 8f95fa6ee5..36041b8f6c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
index d8d80a4434..5e9813b1ca 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
index 16a2760f76..fa2dba3070 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
index 863b1346d7..367fc6d655 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
index b3d73dae64..9d1588fa46 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
index 9a3dc0c9bf..3814f42435 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
@@ -1,4 +1,4 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="struts-tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
index 57bfbf69f2..43e8f53882 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
@@ -1,7 +1,7 @@
 <tr errorFor="myId">
-    <td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
+    <td class="struts-tdErrorMessage" colspan="2"><span class="struts-errorMessage">bar error message</span></td>
 </tr>
 <tr>                                    
-    <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myId" class="struts-errorLabel">mylabel:</label></td>
     <td><input type="text" name="foo" value="bar" id="myId" style="style" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
index e965d43227..899a2a5aae 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
@@ -1,7 +1,7 @@
 <tr errorFor="myId">
-    <td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
+    <td class="struts-tdErrorMessage" colspan="2"><span class="struts-errorMessage">bar error message</span></td>
 </tr>
 <tr>
-    <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myId" class="struts-errorLabel">mylabel:</label></td>
     <td><input type="text" name="foo" value="bar" id="myId" style="errstyle" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
index 67d52b2479..cb3908c15a 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
@@ -1,7 +1,7 @@
 <tr errorFor="myId">
-    <td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
+    <td class="struts-tdErrorMessage" colspan="2"><span class="struts-errorMessage">bar error message</span></td>
 </tr>
 <tr>
-    <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
+    <td class="struts-tdLabel"><label for="myId" class="struts-errorLabel">mylabel:</label></td>
     <td><input type="text" name="foo" value="bar" id="myId" class="errclass" title="mytitle"/></td>
 </tr>