diff --git a/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html
index b08a6aa3..9fbeb4f2 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/AddCollectionTabs.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/InitialSetup/AddPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html
index 741bc13c..23b638d9 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/AddPrimaryTabs.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/InitialSetup/AddSecondaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html
index c1f3f16d..32e8bc61 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/AddSecondaryTabs.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/InitialSetup/DeleteNewTabs.html b/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html
index 0350372d..85e464ee 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/DeleteNewTabs.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/InitialSetup/EditHomeTab.html b/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.html
index 856c6047..a1012ce9 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditHomeTab.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/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
index 1100ab58..565bfa43 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.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/InitialSetup/ReorderPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.html
index f2082beb..5fffc9f8 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/ReorderPrimaryTabs.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>