diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
index d28c9f46..42dd00c5 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
index e688c31d..39b5bc42 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
@@ -66,17 +66,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
index 9099a38c..dd221e62 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
index 97708e7c..d0997327 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
index deeb4d62..6068ab49 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
index 618e5156..d36cb58a 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
index b11aa18f..b32811b3 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
index 185ae8a0..b4c63bc6 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
index 7e0bf463..d3682f59 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
@@ -71,17 +71,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>