diff --git a/browserid/compress.sh b/browserid/compress.sh
index 9ee33236fb0d16057fbec0826c73f910a296ae22..f0c3be699ee27b81172abc73cca33eceb8bb36e1 100755
--- a/browserid/compress.sh
+++ b/browserid/compress.sh
@@ -48,7 +48,7 @@ echo ''
cd ../js
# re-minimize everything together
-cat jquery-1.6.2.min.js json2.js browserid.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-extensions.js ../dialog/resources/storage.js ../dialog/resources/browserid-network.js ../dialog/resources/browserid-identities.js ../dialog/resources/tooltip.js ../dialog/resources/validation.js pages/index.js pages/add_email_address.js pages/verify_email_address.js pages/manage_account.js pages/signin.js pages/signup.js pages/forgot.js > lib.js
+cat jquery-1.6.2.min.js json2.js browserid.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-extensions.js ../dialog/resources/storage.js ../dialog/resources/network.js ../dialog/resources/user.js ../dialog/resources/tooltip.js ../dialog/resources/validation.js pages/index.js pages/add_email_address.js pages/verify_email_address.js pages/manage_account.js pages/signin.js pages/signup.js pages/forgot.js > lib.js
$UGLIFY < lib.js > lib.min.js
cd ../css
diff --git a/browserid/static/dialog/dialog.js b/browserid/static/dialog/dialog.js
index 0284e86006de853eba596ea254bb3a1ca7a15607..d3070184d61ce0bc8855bb5e552a55f8dbeae6f9 100644
--- a/browserid/static/dialog/dialog.js
+++ b/browserid/static/dialog/dialog.js
@@ -54,10 +54,10 @@ steal.plugins(
'tooltip',
'validation',
'browserid-extensions',
- 'browserid-network',
- 'browserid-identities',
- 'browserid-errors',
- 'browserid-wait') // 3rd party script's (like jQueryUI), in resources folder
+ 'network',
+ 'user',
+ 'error-messages',
+ 'wait-messages') // 3rd party script's (like jQueryUI), in resources folder
.controllers('page',
'dialog',
diff --git a/browserid/static/dialog/resources/browserid-errors.js b/browserid/static/dialog/resources/error-messages.js
similarity index 100%
rename from browserid/static/dialog/resources/browserid-errors.js
rename to browserid/static/dialog/resources/error-messages.js
diff --git a/browserid/static/dialog/resources/browserid-network.js b/browserid/static/dialog/resources/network.js
similarity index 100%
rename from browserid/static/dialog/resources/browserid-network.js
rename to browserid/static/dialog/resources/network.js
diff --git a/browserid/static/dialog/resources/browserid-identities.js b/browserid/static/dialog/resources/user.js
similarity index 100%
rename from browserid/static/dialog/resources/browserid-identities.js
rename to browserid/static/dialog/resources/user.js
diff --git a/browserid/static/dialog/resources/browserid-wait.js b/browserid/static/dialog/resources/wait-messages.js
similarity index 100%
rename from browserid/static/dialog/resources/browserid-wait.js
rename to browserid/static/dialog/resources/wait-messages.js
diff --git a/browserid/static/dialog/test/qunit/browserid-network_test.js b/browserid/static/dialog/test/qunit/network_unit_test.js
similarity index 99%
rename from browserid/static/dialog/test/qunit/browserid-network_test.js
rename to browserid/static/dialog/test/qunit/network_unit_test.js
index 46560a6f23e3d81fd59145b000e36b10eb17f102..4da6a9f1856d7535a5c80c26014a76b9b9e55bec 100644
--- a/browserid/static/dialog/test/qunit/browserid-network_test.js
+++ b/browserid/static/dialog/test/qunit/network_unit_test.js
@@ -34,7 +34,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
-steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid-network", function() {
+steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/network", function() {
"use strict";
var testName;
@@ -130,7 +130,7 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid-netw
}
- module("browserid-network", {
+ module("network", {
setup: function() {
network.setXHR(xhr);
xhr.useResult("valid");
diff --git a/browserid/static/dialog/test/qunit/qunit.js b/browserid/static/dialog/test/qunit/qunit.js
index b66d55a29bc6c2832dcd2775d20bffdabe59586e..9c0289f75ab429893ca827cdbbc14277f93c65ac 100644
--- a/browserid/static/dialog/test/qunit/qunit.js
+++ b/browserid/static/dialog/test/qunit/qunit.js
@@ -7,5 +7,5 @@ steal("/dialog/resources/browserid.js",
.then("browserid_unit_test")
.then("validation_unit_test")
.then("storage_unit_test")
- .then("browserid-network_test")
- .then("browserid-identities_unit_test")
+ .then("network_unit_test")
+ .then("user_unit_test")
diff --git a/browserid/static/dialog/test/qunit/storage_unit_test.js b/browserid/static/dialog/test/qunit/storage_unit_test.js
index 305239e3422861f6ac9cfcb2998d2a3189b562f2..352d24113f763ba09c57072714d3c8a228723278 100644
--- a/browserid/static/dialog/test/qunit/storage_unit_test.js
+++ b/browserid/static/dialog/test/qunit/storage_unit_test.js
@@ -37,7 +37,7 @@
steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/storage", function() {
var storage = BrowserID.Storage;
- module("BrowserID.Storage", {
+ module("storage", {
setup: function() {
storage.clear();
},
diff --git a/browserid/static/dialog/test/qunit/browserid-identities_unit_test.js b/browserid/static/dialog/test/qunit/user_unit_test.js
similarity index 99%
rename from browserid/static/dialog/test/qunit/browserid-identities_unit_test.js
rename to browserid/static/dialog/test/qunit/user_unit_test.js
index e32e80392c7852990fe710e05240c30d032876d9..7a34657765a7359835f5aa5240920b2ffc3e363f 100644
--- a/browserid/static/dialog/test/qunit/browserid-identities_unit_test.js
+++ b/browserid/static/dialog/test/qunit/user_unit_test.js
@@ -37,7 +37,7 @@
var jwk = require("./jwk");
var jwcert = require("./jwcert");
-steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid-identities", function() {
+steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/user", function() {
var lib = BrowserID.Identities,
network = BrowserID.Network,
storage = BrowserID.Storage;
@@ -158,7 +158,7 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid-iden
}
};
- module("browserid-identities-unit", {
+ module("user", {
setup: function() {
lib.setNetwork(netStub);
lib.clearStoredEmailKeypairs();
diff --git a/browserid/static/dialog/test/qunit/validation_unit_test.js b/browserid/static/dialog/test/qunit/validation_unit_test.js
index 5a0be014fb44be2d3ead64b13b6f5126a564d17c..1366573ce557a706e38e0d79ae67a7ad66b5a4f6 100644
--- a/browserid/static/dialog/test/qunit/validation_unit_test.js
+++ b/browserid/static/dialog/test/qunit/validation_unit_test.js
@@ -46,7 +46,7 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/browserid", fu
tooltipShown = true;
}
- module("validation-unit", {
+ module("validation", {
setup: function() {
origShowTooltip = bid.Tooltip.showTooltip;
bid.Tooltip.showTooltip = showTooltip;