diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index b9598c6df..6d608f2eb 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -123,14 +123,14 @@ function swarmInject() {
 
 	if ( widget ) {
 		modules = modules.concat([
-			widget + ( deprecated ? "_common_deprecated" : "_common" ),
-			widget + "_core",
-			widget + "_events",
-			widget + "_methods",
-			widget + "_options"
+			( deprecated ? "common-deprecated" : "common" ),
+			"core",
+			"events",
+			"methods",
+			"options"
 		]);
 		if ( deprecated ) {
-			modules = modules.concat( widget + "_deprecated" );
+			modules = modules.concat( "deprecated" );
 		}
 	}
 
diff --git a/tests/unit/accordion/accordion_common.js b/tests/unit/accordion/common.js
similarity index 100%
rename from tests/unit/accordion/accordion_common.js
rename to tests/unit/accordion/common.js
diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/core.js
similarity index 99%
rename from tests/unit/accordion/accordion_core.js
rename to tests/unit/accordion/core.js
index bd3b56752..b1d45f77e 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./accordion_test_helpers",
+	"./helper",
 	"ui/accordion"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/events.js
similarity index 99%
rename from tests/unit/accordion/accordion_events.js
rename to tests/unit/accordion/events.js
index ac05df30d..7f7390c83 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./accordion_test_helpers",
+	"./helper",
 	"ui/accordion"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/helper.js
similarity index 100%
rename from tests/unit/accordion/accordion_test_helpers.js
rename to tests/unit/accordion/helper.js
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/methods.js
similarity index 99%
rename from tests/unit/accordion/accordion_methods.js
rename to tests/unit/accordion/methods.js
index f33996c36..efabfed10 100644
--- a/tests/unit/accordion/accordion_methods.js
+++ b/tests/unit/accordion/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./accordion_test_helpers",
+	"./helper",
 	"ui/accordion"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/options.js
similarity index 99%
rename from tests/unit/accordion/accordion_options.js
rename to tests/unit/accordion/options.js
index d33241dac..c95738c43 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./accordion_test_helpers",
+	"./helper",
 	"ui/accordion"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/autocomplete/autocomplete_common.js b/tests/unit/autocomplete/common.js
similarity index 100%
rename from tests/unit/autocomplete/autocomplete_common.js
rename to tests/unit/autocomplete/common.js
diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/core.js
similarity index 100%
rename from tests/unit/autocomplete/autocomplete_core.js
rename to tests/unit/autocomplete/core.js
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/events.js
similarity index 100%
rename from tests/unit/autocomplete/autocomplete_events.js
rename to tests/unit/autocomplete/events.js
diff --git a/tests/unit/autocomplete/autocomplete_methods.js b/tests/unit/autocomplete/methods.js
similarity index 100%
rename from tests/unit/autocomplete/autocomplete_methods.js
rename to tests/unit/autocomplete/methods.js
diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/options.js
similarity index 100%
rename from tests/unit/autocomplete/autocomplete_options.js
rename to tests/unit/autocomplete/options.js
diff --git a/tests/unit/button/button_common.js b/tests/unit/button/common.js
similarity index 100%
rename from tests/unit/button/button_common.js
rename to tests/unit/button/common.js
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/core.js
similarity index 100%
rename from tests/unit/button/button_core.js
rename to tests/unit/button/core.js
diff --git a/tests/unit/button/button_events.js b/tests/unit/button/events.js
similarity index 100%
rename from tests/unit/button/button_events.js
rename to tests/unit/button/events.js
diff --git a/tests/unit/button/button_methods.js b/tests/unit/button/methods.js
similarity index 100%
rename from tests/unit/button/button_methods.js
rename to tests/unit/button/methods.js
diff --git a/tests/unit/button/button_options.js b/tests/unit/button/options.js
similarity index 100%
rename from tests/unit/button/button_options.js
rename to tests/unit/button/options.js
diff --git a/tests/unit/datepicker/datepicker_common.js b/tests/unit/datepicker/common.js
similarity index 100%
rename from tests/unit/datepicker/datepicker_common.js
rename to tests/unit/datepicker/common.js
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/core.js
similarity index 99%
rename from tests/unit/datepicker/datepicker_core.js
rename to tests/unit/datepicker/core.js
index a1e75848a..f6e0dd58f 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/core.js
@@ -1,7 +1,7 @@
 define( [
 	"jquery",
 	"lib/common",
-	"./datepicker_test_helpers",
+	"./helper",
 	"ui/datepicker",
 	"ui/i18n/datepicker-he"
 ], function( $, common, testHelper ) {
diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/events.js
similarity index 99%
rename from tests/unit/datepicker/datepicker_events.js
rename to tests/unit/datepicker/events.js
index 04a4cbfe8..ea69c1aaa 100644
--- a/tests/unit/datepicker/datepicker_events.js
+++ b/tests/unit/datepicker/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./datepicker_test_helpers",
+	"./helper",
 	"ui/datepicker"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/datepicker/datepicker_test_helpers.js b/tests/unit/datepicker/helper.js
similarity index 100%
rename from tests/unit/datepicker/datepicker_test_helpers.js
rename to tests/unit/datepicker/helper.js
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/methods.js
similarity index 99%
rename from tests/unit/datepicker/datepicker_methods.js
rename to tests/unit/datepicker/methods.js
index 3899779a9..14fefacc2 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./datepicker_test_helpers",
+	"./helper",
 	"ui/datepicker"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/options.js
similarity index 99%
rename from tests/unit/datepicker/datepicker_options.js
rename to tests/unit/datepicker/options.js
index ee4a3bae4..c8a30678b 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./datepicker_test_helpers",
+	"./helper",
 	"ui/datepicker",
 	"ui/i18n/datepicker-fr",
 	"ui/i18n/datepicker-he",
diff --git a/tests/unit/dialog/dialog_common_deprecated.js b/tests/unit/dialog/common-deprecated.js
similarity index 100%
rename from tests/unit/dialog/dialog_common_deprecated.js
rename to tests/unit/dialog/common-deprecated.js
diff --git a/tests/unit/dialog/dialog_common.js b/tests/unit/dialog/common.js
similarity index 100%
rename from tests/unit/dialog/dialog_common.js
rename to tests/unit/dialog/common.js
diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/core.js
similarity index 100%
rename from tests/unit/dialog/dialog_core.js
rename to tests/unit/dialog/core.js
diff --git a/tests/unit/dialog/dialog_deprecated.html b/tests/unit/dialog/deprecated.html
similarity index 100%
rename from tests/unit/dialog/dialog_deprecated.html
rename to tests/unit/dialog/deprecated.html
diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/deprecated.js
similarity index 100%
rename from tests/unit/dialog/dialog_deprecated.js
rename to tests/unit/dialog/deprecated.js
diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/events.js
similarity index 99%
rename from tests/unit/dialog/dialog_events.js
rename to tests/unit/dialog/events.js
index cc5bef8fa..5834b3481 100644
--- a/tests/unit/dialog/dialog_events.js
+++ b/tests/unit/dialog/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./dialog_test_helpers",
+	"./helper",
 	"ui/dialog"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/dialog/dialog_test_helpers.js b/tests/unit/dialog/helper.js
similarity index 100%
rename from tests/unit/dialog/dialog_test_helpers.js
rename to tests/unit/dialog/helper.js
diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/methods.js
similarity index 100%
rename from tests/unit/dialog/dialog_methods.js
rename to tests/unit/dialog/methods.js
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/options.js
similarity index 99%
rename from tests/unit/dialog/dialog_options.js
rename to tests/unit/dialog/options.js
index 1b9af7a09..c33a97c01 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./dialog_test_helpers",
+	"./helper",
 	"ui/dialog",
 	"ui/effect-blind",
 	"ui/effect-explode"
diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/common.js
similarity index 100%
rename from tests/unit/draggable/draggable_common.js
rename to tests/unit/draggable/common.js
diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/core.js
similarity index 99%
rename from tests/unit/draggable/draggable_core.js
rename to tests/unit/draggable/core.js
index 6f6dc1a14..6e12b3521 100644
--- a/tests/unit/draggable/draggable_core.js
+++ b/tests/unit/draggable/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./draggable_test_helpers",
+	"./helper",
 	"ui/draggable",
 	"ui/droppable",
 	"ui/resizable"
diff --git a/tests/unit/draggable/draggable_events.js b/tests/unit/draggable/events.js
similarity index 100%
rename from tests/unit/draggable/draggable_events.js
rename to tests/unit/draggable/events.js
diff --git a/tests/unit/draggable/draggable_test_helpers.js b/tests/unit/draggable/helper.js
similarity index 100%
rename from tests/unit/draggable/draggable_test_helpers.js
rename to tests/unit/draggable/helper.js
diff --git a/tests/unit/draggable/draggable_methods.js b/tests/unit/draggable/methods.js
similarity index 99%
rename from tests/unit/draggable/draggable_methods.js
rename to tests/unit/draggable/methods.js
index 74c5b67e8..195e9e2fb 100644
--- a/tests/unit/draggable/draggable_methods.js
+++ b/tests/unit/draggable/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./draggable_test_helpers",
+	"./helper",
 	"ui/draggable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/options.js
similarity index 99%
rename from tests/unit/draggable/draggable_options.js
rename to tests/unit/draggable/options.js
index 5368103b7..877b4275c 100644
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./draggable_test_helpers",
+	"./helper",
 	"ui/draggable",
 	"ui/droppable",
 	"ui/sortable"
diff --git a/tests/unit/droppable/droppable_common_deprecated.js b/tests/unit/droppable/common-deprecated.js
similarity index 100%
rename from tests/unit/droppable/droppable_common_deprecated.js
rename to tests/unit/droppable/common-deprecated.js
diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/common.js
similarity index 100%
rename from tests/unit/droppable/droppable_common.js
rename to tests/unit/droppable/common.js
diff --git a/tests/unit/droppable/droppable_core.js b/tests/unit/droppable/core.js
similarity index 95%
rename from tests/unit/droppable/droppable_core.js
rename to tests/unit/droppable/core.js
index 25d052a59..43608353d 100644
--- a/tests/unit/droppable/droppable_core.js
+++ b/tests/unit/droppable/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./droppable_test_helpers",
+	"./helper",
 	"ui/droppable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/droppable/droppable_deprecated.html b/tests/unit/droppable/deprecated.html
similarity index 100%
rename from tests/unit/droppable/droppable_deprecated.html
rename to tests/unit/droppable/deprecated.html
diff --git a/tests/unit/droppable/droppable_deprecated.js b/tests/unit/droppable/deprecated.js
similarity index 100%
rename from tests/unit/droppable/droppable_deprecated.js
rename to tests/unit/droppable/deprecated.js
diff --git a/tests/unit/droppable/droppable_events.js b/tests/unit/droppable/events.js
similarity index 100%
rename from tests/unit/droppable/droppable_events.js
rename to tests/unit/droppable/events.js
diff --git a/tests/unit/droppable/droppable_test_helpers.js b/tests/unit/droppable/helper.js
similarity index 100%
rename from tests/unit/droppable/droppable_test_helpers.js
rename to tests/unit/droppable/helper.js
diff --git a/tests/unit/droppable/droppable_methods.js b/tests/unit/droppable/methods.js
similarity index 98%
rename from tests/unit/droppable/droppable_methods.js
rename to tests/unit/droppable/methods.js
index 816fed0ec..1c9bba023 100644
--- a/tests/unit/droppable/droppable_methods.js
+++ b/tests/unit/droppable/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./droppable_test_helpers",
+	"./helper",
 	"ui/droppable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/droppable/droppable_options.js b/tests/unit/droppable/options.js
similarity index 100%
rename from tests/unit/droppable/droppable_options.js
rename to tests/unit/droppable/options.js
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/core.js
similarity index 100%
rename from tests/unit/effects/effects_core.js
rename to tests/unit/effects/core.js
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index d444d3853..91c31428c 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Effects Test Suite</title>
 
 	<script src="../../lib/css.js"></script>
-	<script src="../../lib/bootstrap.js" data-modules="effects_core effects_scale">
+	<script src="../../lib/bootstrap.js" data-modules="core scale">
 	</script>
 	<style>
 	#qunit-fixture {
diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/scale.js
similarity index 100%
rename from tests/unit/effects/effects_scale.js
rename to tests/unit/effects/scale.js
diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/common.js
similarity index 100%
rename from tests/unit/menu/menu_common.js
rename to tests/unit/menu/common.js
diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/core.js
similarity index 99%
rename from tests/unit/menu/menu_core.js
rename to tests/unit/menu/core.js
index 7ff127009..08644c31f 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./menu_test_helpers",
+	"./helper",
 	"ui/menu"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/events.js
similarity index 99%
rename from tests/unit/menu/menu_events.js
rename to tests/unit/menu/events.js
index 9e0e0a2b7..5cac3e737 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./menu_test_helpers",
+	"./helper",
 	"ui/menu"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/helper.js
similarity index 100%
rename from tests/unit/menu/menu_test_helpers.js
rename to tests/unit/menu/helper.js
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/methods.js
similarity index 99%
rename from tests/unit/menu/menu_methods.js
rename to tests/unit/menu/methods.js
index 61be3229f..e322ab214 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./menu_test_helpers",
+	"./helper",
 	"ui/menu"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/options.js
similarity index 99%
rename from tests/unit/menu/menu_options.js
rename to tests/unit/menu/options.js
index 762b057fb..8994b026f 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./menu_test_helpers",
+	"./helper",
 	"ui/menu"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/core.js
similarity index 100%
rename from tests/unit/position/position_core.js
rename to tests/unit/position/core.js
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 1d4087281..e36ab5480 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../lib/css.js"></script>
-	<script src="../../lib/bootstrap.js" data-modules="position_core"></script>
+	<script src="../../lib/bootstrap.js" data-modules="core"></script>
 </head>
 <body>
 <div id="qunit" style="position:relative; z-index:2;"></div>
diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/common.js
similarity index 100%
rename from tests/unit/progressbar/progressbar_common.js
rename to tests/unit/progressbar/common.js
diff --git a/tests/unit/progressbar/progressbar_core.js b/tests/unit/progressbar/core.js
similarity index 100%
rename from tests/unit/progressbar/progressbar_core.js
rename to tests/unit/progressbar/core.js
diff --git a/tests/unit/progressbar/progressbar_events.js b/tests/unit/progressbar/events.js
similarity index 100%
rename from tests/unit/progressbar/progressbar_events.js
rename to tests/unit/progressbar/events.js
diff --git a/tests/unit/progressbar/progressbar_methods.js b/tests/unit/progressbar/methods.js
similarity index 100%
rename from tests/unit/progressbar/progressbar_methods.js
rename to tests/unit/progressbar/methods.js
diff --git a/tests/unit/progressbar/progressbar_options.js b/tests/unit/progressbar/options.js
similarity index 100%
rename from tests/unit/progressbar/progressbar_options.js
rename to tests/unit/progressbar/options.js
diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/common.js
similarity index 100%
rename from tests/unit/resizable/resizable_common.js
rename to tests/unit/resizable/common.js
diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/core.js
similarity index 99%
rename from tests/unit/resizable/resizable_core.js
rename to tests/unit/resizable/core.js
index a63189511..8c21fbd7d 100644
--- a/tests/unit/resizable/resizable_core.js
+++ b/tests/unit/resizable/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./resizable_test_helpers",
+	"./helper",
 	"ui/resizable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/events.js
similarity index 99%
rename from tests/unit/resizable/resizable_events.js
rename to tests/unit/resizable/events.js
index a26824137..2a06f87cc 100644
--- a/tests/unit/resizable/resizable_events.js
+++ b/tests/unit/resizable/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./resizable_test_helpers",
+	"./helper",
 	"ui/resizable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/resizable/resizable_test_helpers.js b/tests/unit/resizable/helper.js
similarity index 100%
rename from tests/unit/resizable/resizable_test_helpers.js
rename to tests/unit/resizable/helper.js
diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/methods.js
similarity index 100%
rename from tests/unit/resizable/resizable_methods.js
rename to tests/unit/resizable/methods.js
diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/options.js
similarity index 99%
rename from tests/unit/resizable/resizable_options.js
rename to tests/unit/resizable/options.js
index bf9033f13..7d9615b64 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./resizable_test_helpers",
+	"./helper",
 	"ui/resizable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/common.js
similarity index 100%
rename from tests/unit/selectable/selectable_common.js
rename to tests/unit/selectable/common.js
diff --git a/tests/unit/selectable/selectable_core.js b/tests/unit/selectable/core.js
similarity index 100%
rename from tests/unit/selectable/selectable_core.js
rename to tests/unit/selectable/core.js
diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/events.js
similarity index 100%
rename from tests/unit/selectable/selectable_events.js
rename to tests/unit/selectable/events.js
diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/methods.js
similarity index 100%
rename from tests/unit/selectable/selectable_methods.js
rename to tests/unit/selectable/methods.js
diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/options.js
similarity index 100%
rename from tests/unit/selectable/selectable_options.js
rename to tests/unit/selectable/options.js
diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/common.js
similarity index 100%
rename from tests/unit/selectmenu/selectmenu_common.js
rename to tests/unit/selectmenu/common.js
diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/core.js
similarity index 100%
rename from tests/unit/selectmenu/selectmenu_core.js
rename to tests/unit/selectmenu/core.js
diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/events.js
similarity index 100%
rename from tests/unit/selectmenu/selectmenu_events.js
rename to tests/unit/selectmenu/events.js
diff --git a/tests/unit/selectmenu/selectmenu_methods.js b/tests/unit/selectmenu/methods.js
similarity index 100%
rename from tests/unit/selectmenu/selectmenu_methods.js
rename to tests/unit/selectmenu/methods.js
diff --git a/tests/unit/selectmenu/selectmenu_options.js b/tests/unit/selectmenu/options.js
similarity index 100%
rename from tests/unit/selectmenu/selectmenu_options.js
rename to tests/unit/selectmenu/options.js
diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/common.js
similarity index 100%
rename from tests/unit/slider/slider_common.js
rename to tests/unit/slider/common.js
diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/core.js
similarity index 100%
rename from tests/unit/slider/slider_core.js
rename to tests/unit/slider/core.js
diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/events.js
similarity index 100%
rename from tests/unit/slider/slider_events.js
rename to tests/unit/slider/events.js
diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/methods.js
similarity index 100%
rename from tests/unit/slider/slider_methods.js
rename to tests/unit/slider/methods.js
diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/options.js
similarity index 100%
rename from tests/unit/slider/slider_options.js
rename to tests/unit/slider/options.js
diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/common.js
similarity index 100%
rename from tests/unit/sortable/sortable_common.js
rename to tests/unit/sortable/common.js
diff --git a/tests/unit/sortable/sortable_core.js b/tests/unit/sortable/core.js
similarity index 97%
rename from tests/unit/sortable/sortable_core.js
rename to tests/unit/sortable/core.js
index 64bdb661e..7e973ec05 100644
--- a/tests/unit/sortable/sortable_core.js
+++ b/tests/unit/sortable/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./sortable_test_helpers",
+	"./helper",
 	"ui/sortable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/sortable/sortable_events.js b/tests/unit/sortable/events.js
similarity index 99%
rename from tests/unit/sortable/sortable_events.js
rename to tests/unit/sortable/events.js
index 453b8b7b6..174da203d 100644
--- a/tests/unit/sortable/sortable_events.js
+++ b/tests/unit/sortable/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./sortable_test_helpers",
+	"./helper",
 	"ui/sortable",
 	"ui/draggable"
 ], function( $, testHelper ) {
diff --git a/tests/unit/sortable/sortable_test_helpers.js b/tests/unit/sortable/helper.js
similarity index 100%
rename from tests/unit/sortable/sortable_test_helpers.js
rename to tests/unit/sortable/helper.js
diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/methods.js
similarity index 99%
rename from tests/unit/sortable/sortable_methods.js
rename to tests/unit/sortable/methods.js
index d3bb23d6e..d88b8089f 100644
--- a/tests/unit/sortable/sortable_methods.js
+++ b/tests/unit/sortable/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./sortable_test_helpers",
+	"./helper",
 	"ui/sortable"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/options.js
similarity index 100%
rename from tests/unit/sortable/sortable_options.js
rename to tests/unit/sortable/options.js
diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/common.js
similarity index 100%
rename from tests/unit/spinner/spinner_common.js
rename to tests/unit/spinner/common.js
diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/core.js
similarity index 99%
rename from tests/unit/spinner/spinner_core.js
rename to tests/unit/spinner/core.js
index d0388a575..aabfd7aa5 100644
--- a/tests/unit/spinner/spinner_core.js
+++ b/tests/unit/spinner/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./spinner_test_helpers",
+	"./helper",
 	"ui/spinner"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/events.js
similarity index 99%
rename from tests/unit/spinner/spinner_events.js
rename to tests/unit/spinner/events.js
index a37d61346..a837f47c9 100644
--- a/tests/unit/spinner/spinner_events.js
+++ b/tests/unit/spinner/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./spinner_test_helpers",
+	"./helper",
 	"ui/spinner"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/spinner/spinner_test_helpers.js b/tests/unit/spinner/helper.js
similarity index 100%
rename from tests/unit/spinner/spinner_test_helpers.js
rename to tests/unit/spinner/helper.js
diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/methods.js
similarity index 99%
rename from tests/unit/spinner/spinner_methods.js
rename to tests/unit/spinner/methods.js
index 75ae5c9e8..d6bf325f2 100644
--- a/tests/unit/spinner/spinner_methods.js
+++ b/tests/unit/spinner/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./spinner_test_helpers",
+	"./helper",
 	"ui/spinner"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/options.js
similarity index 100%
rename from tests/unit/spinner/spinner_options.js
rename to tests/unit/spinner/options.js
diff --git a/tests/unit/tabs/tabs_common.js b/tests/unit/tabs/common.js
similarity index 100%
rename from tests/unit/tabs/tabs_common.js
rename to tests/unit/tabs/common.js
diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/core.js
similarity index 99%
rename from tests/unit/tabs/tabs_core.js
rename to tests/unit/tabs/core.js
index 2e39ca0e6..82dc61a1f 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./tabs_test_helpers",
+	"./helper",
 	"ui/tabs"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/events.js
similarity index 99%
rename from tests/unit/tabs/tabs_events.js
rename to tests/unit/tabs/events.js
index fb2746248..ec2f61214 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/events.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./tabs_test_helpers",
+	"./helper",
 	"ui/tabs"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/tabs/tabs_test_helpers.js b/tests/unit/tabs/helper.js
similarity index 100%
rename from tests/unit/tabs/tabs_test_helpers.js
rename to tests/unit/tabs/helper.js
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/methods.js
similarity index 99%
rename from tests/unit/tabs/tabs_methods.js
rename to tests/unit/tabs/methods.js
index fc1ff6dd6..5975e5889 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./tabs_test_helpers",
+	"./helper",
 	"ui/tabs"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/options.js
similarity index 99%
rename from tests/unit/tabs/tabs_options.js
rename to tests/unit/tabs/options.js
index e4c3efa15..e1a663a71 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"./tabs_test_helpers",
+	"./helper",
 	"ui/tabs"
 ], function( $, testHelper ) {
 
diff --git a/tests/unit/tooltip/tooltip_common_deprecated.js b/tests/unit/tooltip/common-deprecated.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_common_deprecated.js
rename to tests/unit/tooltip/common-deprecated.js
diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/common.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_common.js
rename to tests/unit/tooltip/common.js
diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/core.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_core.js
rename to tests/unit/tooltip/core.js
diff --git a/tests/unit/tooltip/tooltip_deprecated.html b/tests/unit/tooltip/deprecated.html
similarity index 100%
rename from tests/unit/tooltip/tooltip_deprecated.html
rename to tests/unit/tooltip/deprecated.html
diff --git a/tests/unit/tooltip/tooltip_deprecated.js b/tests/unit/tooltip/deprecated.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_deprecated.js
rename to tests/unit/tooltip/deprecated.js
diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/events.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_events.js
rename to tests/unit/tooltip/events.js
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/methods.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_methods.js
rename to tests/unit/tooltip/methods.js
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/options.js
similarity index 100%
rename from tests/unit/tooltip/tooltip_options.js
rename to tests/unit/tooltip/options.js
diff --git a/tests/unit/widget/widget_animation.js b/tests/unit/widget/animation.js
similarity index 100%
rename from tests/unit/widget/widget_animation.js
rename to tests/unit/widget/animation.js
diff --git a/tests/unit/widget/widget_classes.js b/tests/unit/widget/classes.js
similarity index 100%
rename from tests/unit/widget/widget_classes.js
rename to tests/unit/widget/classes.js
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/core.js
similarity index 100%
rename from tests/unit/widget/widget_core.js
rename to tests/unit/widget/core.js
diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/extend.js
similarity index 100%
rename from tests/unit/widget/widget_extend.js
rename to tests/unit/widget/extend.js
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 8ccce8525..0e9d50051 100644
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,13 +5,7 @@
 	<title>jQuery UI Widget Test Suite</title>
 
 	<script src="../../lib/css.js" data-modules="core"></script>
-	<script src="../../lib/bootstrap.js"
-		data-modules="
-			widget_core
-			widget_extend
-			widget_animation
-			widget_classes
-		">
+	<script src="../../lib/bootstrap.js" data-modules="core extend animation classes">
 	</script>
 </head>
 <body>