diff --git a/Calendar.js b/Calendar.js
index 4fa5a5e28..381c5c915 100644
--- a/Calendar.js
+++ b/Calendar.js
@@ -11,17 +11,17 @@ define([
 	"dojo/on",
 	"dojo/sniff", // has("ie")
 	"./CalendarLite",
-	"./_Widget",
+	"./_WidgetBase",
 	"./_CssStateMixin",
 	"./_TemplatedMixin",
 	"./form/DropDownButton"
-], function(array, date, local, declare, domAttr, domClass, kernel, keys, lang, on, has, CalendarLite, _Widget, _CssStateMixin, _TemplatedMixin, DropDownButton){
+], function(array, date, local, declare, domAttr, domClass, kernel, keys, lang, on, has, CalendarLite, _WidgetBase, _CssStateMixin, _TemplatedMixin, DropDownButton){
 
 	// module:
 	//		dijit/Calendar
 
 	var Calendar = declare("dijit.Calendar",
-		[CalendarLite, _Widget, _CssStateMixin], // _Widget for deprecated methods like setAttribute()
+		[CalendarLite, _WidgetBase, _CssStateMixin], // _WidgetBase for deprecated methods like setAttribute()
 		{
 			// summary:
 			//		A simple GUI for choosing a date in the context of a monthly calendar.
@@ -285,7 +285,7 @@ define([
 		}
 	});
 
-	Calendar._MonthDropDown = declare("dijit.Calendar._MonthDropDown", [_Widget, _TemplatedMixin], {
+	Calendar._MonthDropDown = declare("dijit.Calendar._MonthDropDown", [_WidgetBase, _TemplatedMixin], {
 		// summary:
 		//		The list-of-months drop down from the MonthDropDownButton
 
diff --git a/ColorPalette.js b/ColorPalette.js
index bae06813d..07e7b4eed 100644
--- a/ColorPalette.js
+++ b/ColorPalette.js
@@ -1,7 +1,7 @@
 define([
 	"require", // require.toUrl
 	"dojo/text!./templates/ColorPalette.html",
-	"./_Widget", // used also to load dijit/hccss for setting has("highcontrast")
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./_PaletteMixin",
 	"./hccss", // has("highcontrast")
@@ -12,13 +12,13 @@ define([
 	"dojo/string", // string.substitute
 	"dojo/i18n!dojo/nls/colors", // translations
 	"dojo/colors"    // extend dojo.Color w/names of other colors
-], function(require, template, _Widget, _TemplatedMixin, _PaletteMixin, has, i18n, Color,
+], function(require, template, _WidgetBase, _TemplatedMixin, _PaletteMixin, has, i18n, Color,
 	declare, domConstruct, string){
 
 	// module:
 	//		dijit/ColorPalette
 
-	var ColorPalette = declare("dijit.ColorPalette", [_Widget, _TemplatedMixin, _PaletteMixin], {
+	var ColorPalette = declare("dijit.ColorPalette", [_WidgetBase, _TemplatedMixin, _PaletteMixin], {
 		// summary:
 		//		A keyboard accessible color-picking widget
 		// description:
diff --git a/Declaration.js b/Declaration.js
index 3c8614881..13238caa0 100644
--- a/Declaration.js
+++ b/Declaration.js
@@ -5,16 +5,16 @@ define([
 	"dojo/_base/lang", // lang.getObject
 	"dojo/parser", // parser._functionFromScript
 	"dojo/query", // query
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./_WidgetsInTemplateMixin",
 	"dojo/NodeList-dom"
-], function(array, aspect, declare, lang, parser, query, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin){
+], function(array, aspect, declare, lang, parser, query, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin){
 
 	// module:
 	//		dijit/Declaration
 
-	return declare("dijit.Declaration", _Widget, {
+	return declare("dijit.Declaration", _WidgetBase, {
 		// summary:
 		//		The Declaration widget allows a developer to declare new widget
 		//		classes directly from a snippet of markup.
@@ -38,7 +38,7 @@ define([
 
 		// mixins: [const] String[]
 		//		List containing the prototype for this widget, and also any mixins,
-		//		ex: ["dijit._Widget", "dijit._Container"]
+		//		ex: ["dijit._WidgetBase", "dijit._Container"]
 		mixins: [],
 
 		buildRendering: function(){
@@ -70,7 +70,7 @@ define([
 			if(this.mixins.length){
 				this.mixins = array.map(this.mixins, function(name){ return lang.getObject(name); } );
 			}else{
-				this.mixins = [ _Widget, _TemplatedMixin, _WidgetsInTemplateMixin ];
+				this.mixins = [ _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin ];
 			}
 
 			propList._skipNodeCache = true;
diff --git a/Dialog.js b/Dialog.js
index 45bd7fa79..1bf46598a 100644
--- a/Dialog.js
+++ b/Dialog.js
@@ -19,7 +19,7 @@ define([
 	"dojo/dnd/TimedMoveable", // TimedMoveable
 	"./focus",
 	"./_base/manager", // manager.defaultDuration
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./_CssStateMixin",
 	"./form/_FormMixin",
@@ -30,7 +30,7 @@ define([
 	"dojo/i18n!./nls/common"
 ], function(require, array, aspect, declare, Deferred,
 			dom, domClass, domGeometry, domStyle, fx, i18n, keys, lang, on, ready, has, winUtils,
-			Moveable, TimedMoveable, focus, manager, _Widget, _TemplatedMixin, _CssStateMixin, _FormMixin, _DialogMixin,
+			Moveable, TimedMoveable, focus, manager, _WidgetBase, _TemplatedMixin, _CssStateMixin, _FormMixin, _DialogMixin,
 			DialogUnderlay, ContentPane, template){
 
 	// module:
diff --git a/DialogUnderlay.js b/DialogUnderlay.js
index 0621f8b0e..1c8ed8cd7 100644
--- a/DialogUnderlay.js
+++ b/DialogUnderlay.js
@@ -6,7 +6,7 @@ define([
 	"dojo/dom-style", // domStyle.getComputedStyle
 	"dojo/on",
 	"dojo/window", // winUtils.getBox, winUtils.get
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./BackgroundIframe",
 	"./Viewport",
@@ -17,7 +17,7 @@ define([
 	// module:
 	//		dijit/DialogUnderlay
 
-	var DialogUnderlay = declare("dijit.DialogUnderlay", [_Widget, _TemplatedMixin], {
+	var DialogUnderlay = declare("dijit.DialogUnderlay", [_WidgetBase, _TemplatedMixin], {
 		// summary:
 		//		A component used to block input behind a `dijit/Dialog`.
 		//
diff --git a/InlineEditBox.js b/InlineEditBox.js
index ab78ce568..af59080f9 100644
--- a/InlineEditBox.js
+++ b/InlineEditBox.js
@@ -16,7 +16,7 @@ define([
 	"dojo/when",
 	"./a11yclick",
 	"./focus",
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./_WidgetsInTemplateMixin",
 	"./_Container",
@@ -25,12 +25,12 @@ define([
 	"./form/TextBox",
 	"dojo/text!./templates/InlineEditBox.html",
 	"dojo/i18n!./nls/common"
-], function(require, array, aspect, declare, domAttr, domClass, domConstruct, domStyle, i18n, kernel, keys, lang, on, has, when, a11yclick, fm, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, Button, _TextBoxMixin, TextBox, template){
+], function(require, array, aspect, declare, domAttr, domClass, domConstruct, domStyle, i18n, kernel, keys, lang, on, has, when, a11yclick, fm, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, Button, _TextBoxMixin, TextBox, template){
 
 	// module:
 	//		dijit/InlineEditBox
 
-	var InlineEditor = declare("dijit._InlineEditor", [_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
+	var InlineEditor = declare("dijit._InlineEditor", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
 		// summary:
 		//		Internal widget used by InlineEditBox, displayed when in editing mode
 		//		to display the editor and maybe save/cancel buttons.  Calling code should
@@ -255,7 +255,7 @@ define([
 	});
 
 
-	var InlineEditBox = declare("dijit.InlineEditBox" + (has("dojo-bidi") ? "_NoBidi" : ""), _Widget, {
+	var InlineEditBox = declare("dijit.InlineEditBox" + (has("dojo-bidi") ? "_NoBidi" : ""), _WidgetBase, {
 		// summary:
 		//		An element with in-line edit capabilities
 		//
diff --git a/MenuItem.js b/MenuItem.js
index edd9747c1..8db35baa1 100644
--- a/MenuItem.js
+++ b/MenuItem.js
@@ -6,19 +6,20 @@ define([
 	"dojo/_base/kernel", // kernel.deprecated
 	"dojo/sniff", // has("ie")
 	"dojo/_base/lang", // lang.hitch
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./_Contained",
 	"./_CssStateMixin",
 	"dojo/text!./templates/MenuItem.html"
 ], function(declare, dom, domAttr, domClass, kernel, has, lang,
-			_Widget, _TemplatedMixin, _Contained, _CssStateMixin, template){
+			_WidgetBase, _TemplatedMixin, _Contained, _CssStateMixin, template){
 
 	// module:
 	//		dijit/MenuItem
 
 	var MenuItem = declare("dijit.MenuItem" + (has("dojo-bidi") ? "_NoBidi" : ""),
-		[_Widget, _TemplatedMixin, _Contained, _CssStateMixin], {
+		[_WidgetBase, _TemplatedMixin, _Contained, _CssStateMixin], {
+
 		// summary:
 		//		A line item in a Menu Widget
 
diff --git a/ProgressBar.js b/ProgressBar.js
index e006bfd6f..2def8cd8c 100644
--- a/ProgressBar.js
+++ b/ProgressBar.js
@@ -4,15 +4,15 @@ define([
 	"dojo/dom-class", // domClass.toggle
 	"dojo/_base/lang", // lang.mixin
 	"dojo/number", // number.format
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"dojo/text!./templates/ProgressBar.html"
-], function(require, declare, domClass, lang, number, _Widget, _TemplatedMixin, template){
+], function(require, declare, domClass, lang, number, _WidgetBase, _TemplatedMixin, template){
 
 	// module:
 	//		dijit/ProgressBar
 
-	return declare("dijit.ProgressBar", [_Widget, _TemplatedMixin], {
+	return declare("dijit.ProgressBar", [_WidgetBase, _TemplatedMixin], {
 		// summary:
 		//		A progress indication widget, showing the amount completed
 		//		(often the percentage completed) of a task.
diff --git a/Toolbar.js b/Toolbar.js
index 43c9a59c7..6202f24d0 100644
--- a/Toolbar.js
+++ b/Toolbar.js
@@ -3,15 +3,15 @@ define([
 	"dojo/_base/declare", // declare
 	"dojo/has",
 	"dojo/keys", // keys.LEFT_ARROW keys.RIGHT_ARROW
-	"./_Widget",
+	"./_WidgetBase",
 	"./_KeyNavContainer",
 	"./_TemplatedMixin"
-], function(require, declare, has, keys, _Widget, _KeyNavContainer, _TemplatedMixin){
+], function(require, declare, has, keys, _WidgetBase, _KeyNavContainer, _TemplatedMixin){
 
 	// module:
 	//		dijit/Toolbar
 
-	return declare("dijit.Toolbar", [_Widget, _TemplatedMixin, _KeyNavContainer], {
+	return declare("dijit.Toolbar", [_WidgetBase, _TemplatedMixin, _KeyNavContainer], {
 		// summary:
 		//		A Toolbar widget, used to hold things like `dijit.Editor` buttons
 
diff --git a/ToolbarSeparator.js b/ToolbarSeparator.js
index 2ec64203d..0e98ef50e 100644
--- a/ToolbarSeparator.js
+++ b/ToolbarSeparator.js
@@ -1,15 +1,15 @@
 define([
 	"dojo/_base/declare", // declare
 	"dojo/dom", // dom.setSelectable
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin"
-], function(declare, dom, _Widget, _TemplatedMixin){
+], function(declare, dom, _WidgetBase, _TemplatedMixin){
 
 	// module:
 	//		dijit/ToolbarSeparator
 
 
-	return declare("dijit.ToolbarSeparator", [_Widget, _TemplatedMixin], {
+	return declare("dijit.ToolbarSeparator", [_WidgetBase, _TemplatedMixin], {
 		// summary:
 		//		A spacer between two `dijit.Toolbar` items
 
diff --git a/Tooltip.js b/Tooltip.js
index 683585340..2bfa07426 100644
--- a/Tooltip.js
+++ b/Tooltip.js
@@ -12,13 +12,13 @@ define([
 	"dojo/sniff", // has("ie")
 	"./_base/manager",	// manager.defaultDuration
 	"./place",
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./BackgroundIframe",
 	"dojo/text!./templates/Tooltip.html",
 	"./main"		// sets dijit.showTooltip etc. for back-compat
 ], function(array, declare, fx, dom, domClass, domGeometry, domStyle, lang, mouse, on, has,
-			manager, place, _Widget, _TemplatedMixin, BackgroundIframe, template, dijit){
+			manager, place, _WidgetBase, _TemplatedMixin, BackgroundIframe, template, dijit){
 
 	// module:
 	//		dijit/Tooltip
@@ -32,7 +32,7 @@ define([
 	// The problem is that Tooltip's implementation supplies it's own <iframe> and interacts directly
 	// with dijit/place, rather than going through dijit/popup like TooltipDialog and other popups (ex: Menu).
 
-	var MasterTooltip = declare("dijit._MasterTooltip", [_Widget, _TemplatedMixin], {
+	var MasterTooltip = declare("dijit._MasterTooltip", [_WidgetBase, _TemplatedMixin], {
 		// summary:
 		//		Internal widget that holds the actual tooltip markup,
 		//		which occurs once per page.
@@ -298,7 +298,7 @@ define([
 		return Tooltip._masterTT && Tooltip._masterTT.hide(aroundNode);
 	};
 
-	var Tooltip = declare("dijit.Tooltip", _Widget, {
+	var Tooltip = declare("dijit.Tooltip", _WidgetBase, {
 		// summary:
 		//		Pops up a tooltip (a help message) when you hover over a node.
 		//		Also provides static show() and hide() methods that can be used without instantiating a dijit/Tooltip.
diff --git a/Tree.js b/Tree.js
index d5239b06a..a1d261dbe 100644
--- a/Tree.js
+++ b/Tree.js
@@ -23,7 +23,7 @@ define([
 	"./focus",
 	"./registry", // registry.byNode(), registry.getEnclosingWidget()
 	"./_base/manager", // manager.defaultDuration
-	"./_Widget",
+	"./_WidgetBase",
 	"./_TemplatedMixin",
 	"./_Container",
 	"./_Contained",
@@ -35,14 +35,14 @@ define([
 	"dojo/query!css2"	// needed when on.selector() used with a string for the selector
 ], function(array, aspect, connect, cookie, declare, Deferred, all,
 			dom, domClass, domGeometry, domStyle, createError, fxUtils, has, kernel, keys, lang, on, topic, touch, when,
-			focus, registry, manager, _Widget, _TemplatedMixin, _Container, _Contained, _CssStateMixin, _KeyNavMixin,
+			focus, registry, manager, _WidgetBase, _TemplatedMixin, _Container, _Contained, _CssStateMixin, _KeyNavMixin,
 			treeNodeTemplate, treeTemplate, _dndSelector){
 
 	// module:
 	//		dijit/Tree
 
 
-	var TreeNode = declare("dijit._TreeNode", [_Widget, _TemplatedMixin, _Container, _Contained, _CssStateMixin], {
+	var TreeNode = declare("dijit._TreeNode", [_WidgetBase, _TemplatedMixin, _Container, _Contained, _CssStateMixin], {
 		// summary:
 		//		Single node within a tree.   This class is used internally
 		//		by Tree and should not be accessed directly.
@@ -518,7 +518,7 @@ define([
 		});
 	}
 
-	var Tree = declare("dijit.Tree", [_Widget, _KeyNavMixin, _TemplatedMixin, _CssStateMixin], {
+	var Tree = declare("dijit.Tree", [_WidgetBase, _KeyNavMixin, _TemplatedMixin, _CssStateMixin], {
 		// summary:
 		//		This widget displays hierarchical data from a store.
 
diff --git a/_Contained.js b/_Contained.js
index a61606000..6fabee64d 100644
--- a/_Contained.js
+++ b/_Contained.js
@@ -12,7 +12,7 @@ define([
 		//
 		// example:
 		//	|	// make a basic custom widget that knows about it's parents
-		//	|	declare("my.customClass",[dijit._Widget,dijit._Contained],{});
+		//	|	declare("my.customClass",[dijit._WidgetBase,dijit._Contained],{});
 
 		_getSibling: function(/*String*/ which){
 			// summary:
diff --git a/_MenuBase.js b/_MenuBase.js
index f6d89441b..43032f295 100644
--- a/_MenuBase.js
+++ b/_MenuBase.js
@@ -11,17 +11,17 @@ define([
 	"./a11yclick",
 	"./popup",
 	"./registry",
-	"./_Widget",
+	"./_WidgetBase",
 	"./_CssStateMixin",
 	"./_KeyNavContainer",
 	"./_TemplatedMixin"
 ], function(array, declare, dom, domAttr, domClass, lang, mouse, on, winUtils, a11yclick, pm,
-			registry, _Widget, _CssStateMixin, _KeyNavContainer, _TemplatedMixin){
+			registry, _WidgetBase, _CssStateMixin, _KeyNavContainer, _TemplatedMixin){
 
 	// module:
 	//		dijit/_MenuBase
 
-	return declare("dijit._MenuBase", [_Widget, _TemplatedMixin, _KeyNavContainer, _CssStateMixin], {
+	return declare("dijit._MenuBase", [_WidgetBase, _TemplatedMixin, _KeyNavContainer, _CssStateMixin], {
 		// summary:
 		//		Base class for Menu and MenuBar
 
diff --git a/_TemplatedMixin.js b/_TemplatedMixin.js
index dbe07e7d1..a133a7873 100644
--- a/_TemplatedMixin.js
+++ b/_TemplatedMixin.js
@@ -87,7 +87,7 @@ define([
 				this.domNode = node;
 			}
 
-			// Call down to _Widget.buildRendering() to get base classes assigned
+			// Call down to _WidgetBase.buildRendering() to get base classes assigned
 			// TODO: change the baseClass assignment to _setBaseClassAttr
 			this.inherited(arguments);
 
diff --git a/_Widget.js b/_Widget.js
deleted file mode 100644
index 37423be11..000000000
--- a/_Widget.js
+++ /dev/null
@@ -1,354 +0,0 @@
-define([
-	"dojo/aspect",	// aspect.around
-	"dojo/_base/config",	// config.isDebug
-	"dojo/_base/connect",	// connect.connect
-	"dojo/_base/declare", // declare
-	"dojo/has",
-	"dojo/_base/kernel", // kernel.deprecated
-	"dojo/_base/lang", // lang.hitch
-	"dojo/query",
-	"./registry",	// registry.byNode
-	"./_WidgetBase",
-	"./_OnDijitClickMixin",
-	"./_FocusMixin",
-	"dojo/uacss",		// browser sniffing (included for back-compat; subclasses may be using)
-	"./hccss"		// high contrast mode sniffing (included to set CSS classes on <body>, module ret value unused)
-], function(aspect, config, connect, declare, has, kernel, lang, query,
-			registry, _WidgetBase, _OnDijitClickMixin, _FocusMixin){
-
-
-// module:
-//		dijit/_Widget
-
-
-function connectToDomNode(){
-	// summary:
-	//		If user connects to a widget method === this function, then they will
-	//		instead actually be connecting the equivalent event on this.domNode
-}
-
-// Trap dojo.connect() calls to connectToDomNode methods, and redirect to _Widget.on()
-function aroundAdvice(originalConnect){
-	return function(obj, event, scope, method){
-		if(obj && typeof event == "string" && obj[event] == connectToDomNode){
-			return obj.on(event.substring(2).toLowerCase(), lang.hitch(scope, method));
-		}
-		return originalConnect.apply(connect, arguments);
-	};
-}
-aspect.around(connect, "connect", aroundAdvice);
-if(kernel.connect){
-	aspect.around(kernel, "connect", aroundAdvice);
-}
-
-return declare("dijit._Widget", [_WidgetBase, _OnDijitClickMixin, _FocusMixin], {
-	// summary:
-	//		Old base class for widgets.   New widgets should extend `dijit/_WidgetBase` instead
-	// description:
-	//		Old Base class for Dijit widgets.
-	//
-	//		Extends _WidgetBase, adding support for:
-	//
-	//		- declaratively/programatically specifying widget initialization parameters like
-	//			onMouseMove="foo" that call foo when this.domNode gets a mousemove event
-	//		- ondijitclick:
-	//			Support new data-dojo-attach-event="ondijitclick: ..." that is triggered by a mouse click or a SPACE/ENTER keypress
-	//		- focus related functions:
-	//			In particular, the onFocus()/onBlur() callbacks.   Driven internally by
-	//			dijit/_base/focus.js.
-	//		- deprecated methods
-	//		- onShow(), onHide(), onClose()
-	//
-	//		Also, by loading code in dijit/_base, turns on:
-	//
-	//		- browser sniffing (putting browser class like `dj_ie` on `<html>` node)
-	//		- high contrast mode sniffing (add `dijit_a11y` class to `<body>` if machine is in high contrast mode)
-
-
-	////////////////// DEFERRED CONNECTS ///////////////////
-
-	onClick: connectToDomNode,
-	/*=====
-	onClick: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of mouse click events.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onDblClick: connectToDomNode,
-	/*=====
-	onDblClick: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of mouse double click events.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onKeyDown: connectToDomNode,
-	/*=====
-	onKeyDown: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of keys being pressed down.
-		// event:
-		//		key Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onKeyPress: connectToDomNode,
-	/*=====
-	onKeyPress: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of printable keys being typed.
-		// event:
-		//		key Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onKeyUp: connectToDomNode,
-	/*=====
-	onKeyUp: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of keys being released.
-		// event:
-		//		key Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseDown: connectToDomNode,
-	/*=====
-	onMouseDown: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse button is pressed down.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseMove: connectToDomNode,
-	/*=====
-	onMouseMove: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse moves over nodes contained within this widget.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseOut: connectToDomNode,
-	/*=====
-	onMouseOut: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse moves off of nodes contained within this widget.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseOver: connectToDomNode,
-	/*=====
-	onMouseOver: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse moves onto nodes contained within this widget.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseLeave: connectToDomNode,
-	/*=====
-	onMouseLeave: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse moves off of this widget.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseEnter: connectToDomNode,
-	/*=====
-	onMouseEnter: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse moves onto this widget.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-	onMouseUp: connectToDomNode,
-	/*=====
-	onMouseUp: function(event){
-		// summary:
-		//		Connect to this function to receive notifications of when the mouse button is released.
-		// event:
-		//		mouse Event
-		// tags:
-		//		callback
-	},
-	=====*/
-
-	constructor: function(params /*===== ,srcNodeRef =====*/){
-		// summary:
-		//		Create the widget.
-		// params: Object|null
-		//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
-		//		and functions, typically callbacks like onClick.
-		//		The hash can contain any of the widget's properties, excluding read-only properties.
-		// srcNodeRef: DOMNode|String?
-		//		If a srcNodeRef (DOM node) is specified:
-		//
-		//		- use srcNodeRef.innerHTML as my contents
-		//		- if this is a behavioral widget then apply behavior to that srcNodeRef
-		//		- otherwise, replace srcNodeRef with my generated DOM tree
-
-		// extract parameters like onMouseMove that should connect directly to this.domNode
-		this._toConnect = {};
-		for(var name in params){
-			if(this[name] === connectToDomNode){
-				this._toConnect[name.replace(/^on/, "").toLowerCase()] = params[name];
-				delete params[name];
-			}
-		}
-	},
-
-	postCreate: function(){
-		this.inherited(arguments);
-
-		// perform connection from this.domNode to user specified handlers (ex: onMouseMove)
-		for(var name in this._toConnect){
-			this.on(name, this._toConnect[name]);
-		}
-		delete this._toConnect;
-	},
-
-	on: function(/*String|Function*/ type, /*Function*/ func){
-		if(this[this._onMap(type)] === connectToDomNode){
-			// Use connect.connect() rather than on() to get handling for "onmouseenter" on non-IE,
-			// normalization of onkeypress/onkeydown to behave like firefox, etc.
-			// Also, need to specify context as "this" rather than the default context of the DOMNode
-			// Remove in 2.0.
-			return connect.connect(this.domNode, type.toLowerCase(), this, func);
-		}
-		return this.inherited(arguments);
-	},
-
-	_setFocusedAttr: function(val){
-		// Remove this method in 2.0 (or sooner), just here to set _focused == focused, for back compat
-		// (but since it's a private variable we aren't required to keep supporting it).
-		this._focused = val;
-		this._set("focused", val);
-	},
-
-	////////////////// DEPRECATED METHODS ///////////////////
-
-	setAttribute: function(/*String*/ attr, /*anything*/ value){
-		// summary:
-		//		Deprecated.  Use set() instead.
-		// tags:
-		//		deprecated
-		kernel.deprecated(this.declaredClass+"::setAttribute(attr, value) is deprecated. Use set() instead.", "", "2.0");
-		this.set(attr, value);
-	},
-
-	attr: function(/*String|Object*/name, /*Object?*/value){
-		// summary:
-		//		Set or get properties on a widget instance.
-		// name:
-		//		The property to get or set. If an object is passed here and not
-		//		a string, its keys are used as names of attributes to be set
-		//		and the value of the object as values to set in the widget.
-		// value:
-		//		Optional. If provided, attr() operates as a setter. If omitted,
-		//		the current value of the named property is returned.
-		// description:
-		//		This method is deprecated, use get() or set() directly.
-
-		// Print deprecation warning but only once per calling function
-		if(config.isDebug){
-			var alreadyCalledHash = arguments.callee._ach || (arguments.callee._ach = {}),
-				caller = (arguments.callee.caller || "unknown caller").toString();
-			if(!alreadyCalledHash[caller]){
-				kernel.deprecated(this.declaredClass + "::attr() is deprecated. Use get() or set() instead, called from " +
-				caller, "", "2.0");
-				alreadyCalledHash[caller] = true;
-			}
-		}
-
-		var args = arguments.length;
-		if(args >= 2 || typeof name === "object"){ // setter
-			return this.set.apply(this, arguments);
-		}else{ // getter
-			return this.get(name);
-		}
-	},
-
-	getDescendants: function(){
-		// summary:
-		//		Returns all the widgets contained by this, i.e., all widgets underneath this.containerNode.
-		//		This method should generally be avoided as it returns widgets declared in templates, which are
-		//		supposed to be internal/hidden, but it's left here for back-compat reasons.
-
-		kernel.deprecated(this.declaredClass+"::getDescendants() is deprecated. Use getChildren() instead.", "", "2.0");
-		return this.containerNode ? query('[widgetId]', this.containerNode).map(registry.byNode) : []; // dijit/_WidgetBase[]
-	},
-
-	////////////////// MISCELLANEOUS METHODS ///////////////////
-
-	_onShow: function(){
-		// summary:
-		//		Internal method called when this widget is made visible.
-		//		See `onShow` for details.
-		this.onShow();
-	},
-
-	onShow: function(){
-		// summary:
-		//		Called when this widget becomes the selected pane in a
-		//		`dijit/layout/TabContainer`, `dijit/layout/StackContainer`,
-		//		`dijit/layout/AccordionContainer`, etc.
-		//
-		//		Also called to indicate display of a `dijit.Dialog`, `dijit.TooltipDialog`, or `dijit.TitlePane`.
-		// tags:
-		//		callback
-	},
-
-	onHide: function(){
-		// summary:
-		//		Called when another widget becomes the selected pane in a
-		//		`dijit/layout/TabContainer`, `dijit/layout/StackContainer`,
-		//		`dijit/layout/AccordionContainer`, etc.
-		//
-		//		Also called to indicate hide of a `dijit.Dialog`, `dijit.TooltipDialog`, or `dijit.TitlePane`.
-		// tags:
-		//		callback
-	},
-
-	onClose: function(){
-		// summary:
-		//		Called when this widget is being displayed as a popup (ex: a Calendar popped
-		//		up from a DateTextBox), and it is hidden.
-		//		This is called from the dijit.popup code, and should not be called directly.
-		//
-		//		Also used as a parameter for children of `dijit/layout/StackContainer` or subclasses.
-		//		Callback if a user tries to close the child.   Child will be closed if this function returns true.
-		// tags:
-		//		extension
-
-		return true;		// Boolean
-	}
-});
-;
-});
diff --git a/_editor/RichText.js b/_editor/RichText.js
index bab34ffa1..707083a8d 100644
--- a/_editor/RichText.js
+++ b/_editor/RichText.js
@@ -20,7 +20,7 @@ define([
 	"dojo/_base/unload", // unload
 	"dojo/_base/url", // url
 	"dojo/window", // winUtils.get()
-	"../_Widget",
+	"../_WidgetBase",
 	"../_CssStateMixin",
 	"../selection",
 	"./range",
@@ -29,7 +29,7 @@ define([
 	"../main"    // dijit._scopeName
 ], function(array, config, declare, Deferred, dom, domAttr, domClass, domConstruct, domGeometry, domStyle,
 			kernel, keys, lang, on, query, domReady, has, topic, unload, _Url, winUtils,
-			_Widget, _CssStateMixin, selectionapi, rangeapi, htmlapi, focus, dijit){
+			_WidgetBase, _CssStateMixin, selectionapi, rangeapi, htmlapi, focus, dijit){
 
 	// module:
 	//		dijit/_editor/RichText
@@ -40,7 +40,7 @@ define([
 	//
 	//	<textarea id="dijit._editor.RichText.value" style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>
 
-	var RichText = declare("dijit._editor.RichText", [_Widget, _CssStateMixin], {
+	var RichText = declare("dijit._editor.RichText", [_WidgetBase, _CssStateMixin], {
 		// summary:
 		//		dijit/_editor/RichText is the core of dijit.Editor, which provides basic
 		//		WYSIWYG editing features.
diff --git a/_editor/plugins/FontChoice.js b/_editor/plugins/FontChoice.js
index 0a0207006..d5f314804 100644
--- a/_editor/plugins/FontChoice.js
+++ b/_editor/plugins/FontChoice.js
@@ -7,7 +7,7 @@ define([
 	"dojo/_base/lang", // lang.delegate lang.hitch lang.isString
 	"dojo/store/Memory", // MemoryStore
 	"../../registry", // registry.getUniqueId
-	"../../_Widget",
+	"../../_WidgetBase",
 	"../../_TemplatedMixin",
 	"../../_WidgetsInTemplateMixin",
 	"../../form/FilteringSelect",
@@ -15,13 +15,13 @@ define([
 	"../range",
 	"dojo/i18n!../nls/FontChoice"
 ], function(require, array, declare, domConstruct, i18n, lang, MemoryStore,
-	registry, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, FilteringSelect, _Plugin, rangeapi){
+	registry, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, FilteringSelect, _Plugin, rangeapi){
 
 	// module:
 	//		dijit/_editor/plugins/FontChoice
 
 	var _FontDropDown = declare("dijit._editor.plugins._FontDropDown",
-		[_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
+		[_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
 			// summary:
 			//		Base class for widgets that contains a label (like "Font:")
 			//		and a FilteringSelect drop down to pick a value.
diff --git a/_editor/plugins/LinkDialog.js b/_editor/plugins/LinkDialog.js
index c09e65202..fadae2b14 100644
--- a/_editor/plugins/LinkDialog.js
+++ b/_editor/plugins/LinkDialog.js
@@ -8,12 +8,12 @@ define([
 	"dojo/sniff", // has("ie")
 	"dojo/query", // query
 	"dojo/string", // string.substitute
-	"../../_Widget",
+	"../../_WidgetBase",
 	"../_Plugin",
 	"../../form/DropDownButton",
 	"../range"
 ], function(require, declare, domAttr, keys, lang, on, has, query, string,
-	_Widget, _Plugin, DropDownButton, rangeapi){
+	_WidgetBase, _Plugin, DropDownButton, rangeapi){
 
 	// module:
 	//		dijit/_editor/plugins/LinkDialog
diff --git a/bench/widget_construction_test.php b/bench/widget_construction_test.php
index d677eb08b..74a5ca4a3 100644
--- a/bench/widget_construction_test.php
+++ b/bench/widget_construction_test.php
@@ -12,13 +12,13 @@
 			data-dojo-config="parseOnLoad: true, isDebug: true"></script>
 		<script type="text/javascript">
 			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
-			dojo.require("dijit._Widget");
+			dojo.require("dijit._WidgetBase");
 			dojo.require("dijit._TemplatedMixin");
 
 			/* dummy widget for benchmarking purposes */
 			dojo.declare(
 				"SimpleButton",
-				[ dijit._Widget, dijit._TemplatedMixin ],
+				[ dijit._WidgetBase, dijit._TemplatedMixin ],
 				{
 					label: "",
 
diff --git a/form/Form.js b/form/Form.js
index a53b9cf11..fb627aab5 100644
--- a/form/Form.js
+++ b/form/Form.js
@@ -3,17 +3,17 @@ define([
 	"dojo/dom-attr", // domAttr.set
 	"dojo/_base/kernel", // kernel.deprecated
 	"dojo/sniff", // has("ie")
-	"../_Widget",
+	"../_WidgetBase",
 	"../_TemplatedMixin",
 	"./_FormMixin",
 	"../layout/_ContentPaneResizeMixin"
-], function(declare, domAttr, kernel, has, _Widget, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin){
+], function(declare, domAttr, kernel, has, _WidgetBase, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin){
 
 	// module:
 	//		dijit/form/Form
 
 
-	return declare("dijit.form.Form", [_Widget, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin], {
+	return declare("dijit.form.Form", [_WidgetBase, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin], {
 		// summary:
 		//		Widget corresponding to HTML form tag, for validation and serialization
 		//
diff --git a/form/HorizontalRule.js b/form/HorizontalRule.js
index 715223b4e..827e379b1 100644
--- a/form/HorizontalRule.js
+++ b/form/HorizontalRule.js
@@ -1,13 +1,13 @@
 define([
 	"dojo/_base/declare", // declare
-	"../_Widget",
+	"../_WidgetBase",
 	"../_TemplatedMixin"
-], function(declare, _Widget, _TemplatedMixin){
+], function(declare, _WidgetBase, _TemplatedMixin){
 
 	// module:
 	//		dijit/form/HorizontalRule
 
-	return declare("dijit.form.HorizontalRule", [_Widget, _TemplatedMixin], {
+	return declare("dijit.form.HorizontalRule", [_WidgetBase, _TemplatedMixin], {
 		// summary:
 		//		Hash marks for `dijit/form/HorizontalSlider`
 
diff --git a/form/_FormWidget.js b/form/_FormWidget.js
index 8507571e6..59796d885 100644
--- a/form/_FormWidget.js
+++ b/form/_FormWidget.js
@@ -2,11 +2,11 @@ define([
 	"dojo/_base/declare", // declare
 	"dojo/sniff", // has("msapp")
 	"dojo/_base/kernel", // kernel.deprecated
-	"../_Widget",
+	"../_WidgetBase",
 	"../_CssStateMixin",
 	"../_TemplatedMixin",
 	"./_FormWidgetMixin"
-], function(declare, has, kernel, _Widget, _CssStateMixin, _TemplatedMixin, _FormWidgetMixin){
+], function(declare, has, kernel, _WidgetBase, _CssStateMixin, _TemplatedMixin, _FormWidgetMixin){
 
 	// module:
 	//		dijit/form/_FormWidget
@@ -19,7 +19,7 @@ define([
 		});
 	}
 
-	return declare("dijit.form._FormWidget", [_Widget, _TemplatedMixin, _CssStateMixin, _FormWidgetMixin], {
+	return declare("dijit.form._FormWidget", [_WidgetBase, _TemplatedMixin, _CssStateMixin, _FormWidgetMixin], {
 		// summary:
 		//		Base class for widgets corresponding to native HTML elements such as `<checkbox>` or `<button>`,
 		//		which can be children of a `<form>` node or a `dijit/form/Form` widget.
diff --git a/layout/AccordionContainer.js b/layout/AccordionContainer.js
index 4dc942ad2..d1bdb4072 100644
--- a/layout/AccordionContainer.js
+++ b/layout/AccordionContainer.js
@@ -14,7 +14,7 @@ define([
 	"dojo/topic", // publish
 	"../focus", // focus.focus()
 	"../_base/manager", // manager.defaultDuration
-	"../_Widget",
+	"../_WidgetBase",
 	"../_Container",
 	"../_TemplatedMixin",
 	"../_CssStateMixin",
@@ -23,7 +23,7 @@ define([
 	"dojo/text!./templates/AccordionButton.html"
 ], function(require, array, declare, fx, dom, domAttr, domClass, domConstruct, domGeometry,
 			keys, lang, has, topic, focus, manager,
-			_Widget, _Container, _TemplatedMixin, _CssStateMixin, StackContainer, ContentPane, template){
+			_WidgetBase, _Container, _TemplatedMixin, _CssStateMixin, StackContainer, ContentPane, template){
 
 	// module:
 	//		dijit/layout/AccordionContainer
@@ -50,7 +50,7 @@ define([
 	// During animation there are two dijtAccordionChildWrapper's shown, so we need
 	// to compensate for that.
 
-	var AccordionButton = declare("dijit.layout._AccordionButton", [_Widget, _TemplatedMixin, _CssStateMixin], {
+	var AccordionButton = declare("dijit.layout._AccordionButton", [_WidgetBase, _TemplatedMixin, _CssStateMixin], {
 		// summary:
 		//		The title bar to click to open up an accordion pane.
 		//		Internal widget used by AccordionContainer.
@@ -136,7 +136,7 @@ define([
 		});
 	}
 
-	var AccordionInnerContainer = declare("dijit.layout._AccordionInnerContainer" + (has("dojo-bidi") ? "_NoBidi" : ""), [_Widget, _CssStateMixin], {
+	var AccordionInnerContainer = declare("dijit.layout._AccordionInnerContainer" + (has("dojo-bidi") ? "_NoBidi" : ""), [_WidgetBase, _CssStateMixin], {
 		// summary:
 		//		Internal widget placed as direct child of AccordionContainer.containerNode.
 		//		When other widgets are added as children to an AccordionContainer they are wrapped in
diff --git a/layout/BorderContainer.js b/layout/BorderContainer.js
index d4e76dc63..33e94ffbc 100644
--- a/layout/BorderContainer.js
+++ b/layout/BorderContainer.js
@@ -11,17 +11,16 @@ define([
 	"dojo/on",
 	"dojo/touch",
 	"../_WidgetBase",
-	"../_Widget",
 	"../_TemplatedMixin",
 	"./LayoutContainer",
 	"./utils"        // layoutUtils.layoutChildren
 ], function(array, cookie, declare, domClass, domConstruct, domGeometry, domStyle, keys, lang, on, touch,
-			_WidgetBase, _Widget, _TemplatedMixin, LayoutContainer, layoutUtils){
+			_WidgetBase, _TemplatedMixin, LayoutContainer, layoutUtils){
 
 	// module:
 	//		dijit/layout/BorderContainer
 
-	var _Splitter = declare("dijit.layout._Splitter", [_Widget, _TemplatedMixin ],
+	var _Splitter = declare("dijit.layout._Splitter", [_WidgetBase, _TemplatedMixin ],
 		{
 			// summary:
 			//		A draggable spacer between two items in a `dijit/layout/BorderContainer`.
@@ -225,7 +224,7 @@ define([
 			}
 		});
 
-	var _Gutter = declare("dijit.layout._Gutter", [_Widget, _TemplatedMixin],
+	var _Gutter = declare("dijit.layout._Gutter", [_WidgetBase, _TemplatedMixin],
 		{
 			// summary:
 			//		Just a spacer div to separate side pane from center pane.
diff --git a/layout/ContentPane.js b/layout/ContentPane.js
index c8b647e6a..fd39e83e1 100644
--- a/layout/ContentPane.js
+++ b/layout/ContentPane.js
@@ -1,7 +1,7 @@
 define([
 	"dojo/_base/kernel", // kernel.deprecated
 	"dojo/_base/lang", // lang.mixin lang.delegate lang.hitch lang.isFunction lang.isObject
-	"../_Widget",
+	"../_WidgetBase",
 	"../_Container",
 	"./_ContentPaneResizeMixin",
 	"dojo/string", // string.substitute
@@ -16,13 +16,13 @@ define([
 	"dojo/_base/xhr", // xhr.get
 	"dojo/i18n", // i18n.getLocalization
 	"dojo/when"
-], function(kernel, lang, _Widget, _Container, _ContentPaneResizeMixin, string, html, nlsLoading, array, declare,
+], function(kernel, lang, _WidgetBase, _Container, _ContentPaneResizeMixin, string, html, nlsLoading, array, declare,
 			Deferred, dom, domAttr, domConstruct, xhr, i18n, when){
 
 	// module:
 	//		dijit/layout/ContentPane
 
-	return declare("dijit.layout.ContentPane", [_Widget, _Container, _ContentPaneResizeMixin], {
+	return declare("dijit.layout.ContentPane", [_WidgetBase, _Container, _ContentPaneResizeMixin], {
 		// summary:
 		//		A widget containing an HTML fragment, specified inline
 		//		or by uri.  Fragment may include widgets.
@@ -58,10 +58,10 @@ define([
 		//		Changing href after creation doesn't have any effect; Use set('href', ...);
 		href: "",
 
-		// content: String|DomNode|NodeList|dijit/_Widget
+		// content: String|DomNode|NodeList|dijit/_WidgetBase
 		//		The innerHTML of the ContentPane.
 		//		Note that the initialization parameter / argument to set("content", ...)
-		//		can be a String, DomNode, Nodelist, or _Widget.
+		//		can be a String, DomNode, Nodelist, or _WidgetBase.
 		content: "",
 
 		// extractContent: Boolean
@@ -197,7 +197,7 @@ define([
 
 		startup: function(){
 			// summary:
-			//		Call startup() on all children including non _Widget ones like dojo/dnd/Source objects
+			//		Call startup() on all children including non _WidgetBase ones like dojo/dnd/Source objects
 
 			// This starts all the widgets
 			this.inherited(arguments);
diff --git a/layout/StackController.js b/layout/StackController.js
index 543a32bc0..2a58e8abe 100644
--- a/layout/StackController.js
+++ b/layout/StackController.js
@@ -9,12 +9,12 @@ define([
 	"dojo/topic",
 	"../focus", // focus.focus()
 	"../registry", // registry.byId
-	"../_Widget",
+	"../_WidgetBase",
 	"../_TemplatedMixin",
 	"../_Container",
 	"../form/ToggleButton",
 	"dojo/i18n!../nls/common"
-], function(array, declare, domClass, domConstruct, keys, lang, on, topic, focus, registry, _Widget, _TemplatedMixin, _Container, ToggleButton){
+], function(array, declare, domClass, domConstruct, keys, lang, on, topic, focus, registry, _WidgetBase, _TemplatedMixin, _Container, ToggleButton){
 
 	// module:
 	//		dijit/layout/StackController
@@ -45,7 +45,7 @@ define([
 	});
 
 
-	var StackController = declare("dijit.layout.StackController", [_Widget, _TemplatedMixin, _Container], {
+	var StackController = declare("dijit.layout.StackController", [_WidgetBase, _TemplatedMixin, _Container], {
 		// summary:
 		//		Set of buttons to select a page in a `dijit/layout/StackContainer`
 		// description:
diff --git a/layout/_LayoutWidget.js b/layout/_LayoutWidget.js
index 62017db58..83dc9df97 100644
--- a/layout/_LayoutWidget.js
+++ b/layout/_LayoutWidget.js
@@ -1,6 +1,6 @@
 define([
 	"dojo/_base/lang", // lang.mixin
-	"../_Widget",
+	"../_WidgetBase",
 	"../_Container",
 	"../_Contained",
 	"../Viewport",
@@ -8,14 +8,14 @@ define([
 	"dojo/dom-class", // domClass.add domClass.remove
 	"dojo/dom-geometry", // domGeometry.marginBox
 	"dojo/dom-style" // domStyle.getComputedStyle
-], function(lang, _Widget, _Container, _Contained, Viewport,
+], function(lang, _WidgetBase, _Container, _Contained, Viewport,
 	declare, domClass, domGeometry, domStyle){
 
 	// module:
 	//		dijit/layout/_LayoutWidget
 
 
-	return declare("dijit.layout._LayoutWidget", [_Widget, _Container, _Contained], {
+	return declare("dijit.layout._LayoutWidget", [_WidgetBase, _Container, _Contained], {
 		// summary:
 		//		Base class for a _Container widget which is responsible for laying out its children.
 		//		Widgets which mixin this code must define layout() to manage placement and sizing of the children.
diff --git a/popup.js b/popup.js
index a027affe6..af3c08bcc 100644
--- a/popup.js
+++ b/popup.js
@@ -217,7 +217,7 @@ define([
 			});
 
 			if(has("config-bgIframe") && !widget.bgIframe){
-				// setting widget.bgIframe triggers cleanup in _Widget.destroy()
+				// setting widget.bgIframe triggers cleanup in _WidgetBase.destroy()
 				widget.bgIframe = new BackgroundIframe(wrapper);
 			}
 
diff --git a/tests/NodeList-instantiate.html b/tests/NodeList-instantiate.html
index 0e12ae041..e5325486b 100644
--- a/tests/NodeList-instantiate.html
+++ b/tests/NodeList-instantiate.html
@@ -21,7 +21,7 @@
 		<script type="text/javascript">
 			dojo.require("doh.runner");
 			dojo.require("dijit.dijit"); // optimize: load dijit layer
-			dojo.require("dijit._Widget");
+			dojo.require("dijit._WidgetBase");
 			dojo.require("dijit.form.Button");
 			dojo.require("dijit.layout.TabContainer");
 			dojo.require("dijit.layout.ContentPane");
@@ -29,7 +29,7 @@
 	    	dojo.ready(function(){
 
 				// declare a simple widget to use as a base test:
-				dojo.declare("test._Widget",dijit._Widget,{
+				dojo.declare("test._WidgetBase",dijit._WidgetBaseBase,{
 					message:"",
 					postCreate:function(){
 						this.inherited(arguments);
@@ -48,7 +48,7 @@
 		
 				doh.register("Instantiate", [
 					function testWidget(){
-						dojo.query("#list1 li").instantiate(test._Widget,{}).connect("onclick",console.log);
+						dojo.query("#list1 li").instantiate(test._WidgetBase,{}).connect("onclick",console.log);
 	
 						var li = dijit.byId("test__Widget_0");
 						doh.t(li, "test__Widget_0 exists");
@@ -57,7 +57,7 @@
 					},
 					
 					function testWidget2(){
-						dojo.query("#list2 li").instantiate(test._Widget,{ message:"woot" });
+						dojo.query("#list2 li").instantiate(test._WidgetBase,{ message:"woot" });
 	
 						li = dijit.byId("test__Widget_12");
 						doh.t(li, "test__Widget_12 exists");
diff --git a/tests/_Widget-attr.html b/tests/_Widget-attr.html
index 641f83b5d..cded1ee2d 100644
--- a/tests/_Widget-attr.html
+++ b/tests/_Widget-attr.html
@@ -14,11 +14,11 @@
 		require([
 			"doh/runner", "dojo/_base/declare",
 			"dojo/dom", "dojo/dom-attr", "dojo/dom-class", "dojo/dom-style", "dojo/sniff",
-			"dijit/_WidgetBase", "dijit/_Widget",
+			"dijit/_WidgetBase",
 			"dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin",
 			"dojo/domReady!"
 		], function(doh, declare, dom, domAttr, domClass, domStyle, has,
-					_WidgetBase, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin){
+					_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin){
 
 			doh.register("attributes", [
 				// Test attributes mapped to DOMNodes
@@ -173,59 +173,6 @@
 					doh.is("hello", widget.dashNode.innerHTML);
 				},
 
-				// Test deprecated attr() method (remove for 2.0)
-				function attr(){
-					var MyWidget = new declare([_Widget, _TemplatedMixin], {
-						templateString: "<div><span data-dojo-attach-point=nameNode></span></div>",
-						_setNameAttr:  {node: "nameNode", type: "innerHTML"}
-					});
-
-					var b = new MyWidget();
-
-					// simple setting
-					b.attr("name", "thinger");
-					doh.is("thinger", b.attr("name"), "b.attr('name')");
-					doh.is("thinger", b.nameNode.innerHTML, "innerHTML");
-
-					// hash setting
-					b.attr({
-						name: "bang",
-						foo: "zap"
-					});
-					doh.is("bang", b.attr("name"), "hash set of bang");
-					doh.is("zap", b.attr("foo"), "hash set of zap");
-				},
-				
-				// Test deprecated attributeMap (remove for 2.0)
-				function attributeMap(){
-					var AttrMap = declare([_WidgetBase, _TemplatedMixin], {
-						attributeMap: {foo: "", bar: "buttonNode", plainText: {node: "plainTextNode", type: "innerText"}},
-						templateString: "<div class='class1' style='border: 1px solid red; width: 456px'>" +
-											"<button data-dojo-attach-point='buttonNode,focusNode'>hi</button>" +
-											'<span><input data-dojo-attach-point="inputNode" value="input"></span>' +
-											"<span data-dojo-attach-point='containerNode'></span>" +
-											"<span data-dojo-attach-point='plainTextNode'>original plain text</span>" +
-										"</div>"
-					});
-
-					var widget = new AttrMap({
-						foo:"value1",
-						bar:"value2",
-						"class":"class2",
-						style:"height: 123px",
-						plainText: "hello world <>&;"
-					}).placeAt(dom.byId("wrapper"));
-
-					// test that attributes specified to constructor were copied over to the DOM
-					doh.is("value1", widget.domNode.getAttribute("foo"), "widget.domNode.getAttribute('foo')");
-					doh.is("value2", widget.buttonNode.getAttribute("bar"), "widget.domNode.getAttribute('bar')");
-					doh.t(domClass.contains(widget.domNode, "class1"), "class1");
-					doh.t(domClass.contains(widget.domNode, "class2"), "class2");
-					doh.is("123px", widget.domNode.style.height, "height");
-					doh.is("456px", widget.domNode.style.width, "width");
-					doh.is("hello world &lt;&gt;&amp;;", widget.plainTextNode.innerHTML, "innerHTML");
-				},
-
 				// Test that attributes set in the ctor when side effects setter exist
 				// are correctly applied
 				function ctorDependentAttributes(){
diff --git a/tests/_Widget-deferredConnect.html b/tests/_Widget-deferredConnect.html
deleted file mode 100644
index fcc726c0d..000000000
--- a/tests/_Widget-deferredConnect.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<title>_Widget deferred connection test</title>
-	<style type="text/css">
-		@import "../themes/claro/document.css";
-		@import "../themes/claro/claro.css";
-		@import "css/dijitTests.css";
-	</style>
-
-	<script type="text/javascript" src="../../dojo/dojo.js"
-		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
-	<script>
-		dojo.require("dojo.parser");
-		dojo.require("dijit.form.Button");
-
-		overrodeMouseMoved = false;
-		bothOverrodeMouseMoved = false;
-		connectedMouseMoved = false;
-		bothConnectedMouseMoved = false;
-
-		function bothHandler(){
-			if(!bothOverrodeMouseMoved){
-				console.log("'both' button: overrode handler called");
-			}
-			bothOverrodeMouseMoved = true;
-		}
-
-		dojo.ready(function(){
-			dojo.connect(dijit.byId("connect"), "onMouseMove", function(){
-				if(!connectedMouseMoved){
-					console.log("'connect' button: mouse moved");
-				}
-				connectedMouseMoved = true;
-			});
-
-			dojo.connect(dijit.byId("both"), "onMouseMove", function(){
-				if(!bothConnectedMouseMoved){
-					console.log("'both' button: connected handler");
-				}
-				bothConnectedMouseMoved = true;
-			});
-		});
-
-	</script>
-</head>
-<body class="claro">
-	<h1>Test deferred connections</h1>
-	<p>
-		OnMouseMove is a deferred connection, _Widget only call dojo.connect()
-		(data-dojo-attach-event) to connect the onmousemove event on the focusNode to
-		the widget method if needed.
-	</p>
-	<p>
-		Mousing over the three buttons below should call the user-defined mouse-move
-		handlers.  The "both" button has two handlers, and they should both be called.
-	</p>
-
-	<!--
-		"overrode" button specifies an onmousemove handler on initialization.
-	-->
-	<button id="overrode" data-dojo-type="dijit/form/Button"
-		data-dojo-props='onMouseMove:function(){ if(!overrodeMouseMoved){ console.log("\"overrode\" button: mouse moved"); } overrodeMouseMoved = true; }'>
-		overrode
-	</button>
-
-	<!--
-		"connect" button essentially is doing a dojo.connect("connect", "onMouseMove", myFunc).
-		This should trigger an additional dojo.connect() call from Button.focusNode.onmousemove
-		to the Button.onMouseMove empty function.
-	-->
-	<button id="connect" data-dojo-type="dijit/form/Button">
-		connected
-	</button>
-
-	<button id="both" data-dojo-type="dijit/form/Button" data-dojo-props='onMouseMove:bothHandler'>
-		both
-	</button>
-</body>
-</html>
diff --git a/tests/_Widget-ondijitclick.html b/tests/_Widget-ondijitclick.html
deleted file mode 100644
index 633c9ae64..000000000
--- a/tests/_Widget-ondijitclick.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-
-	<title>Test Dijit Internal Event: "ondijitclick"</title>
-
-	<style>
-		div {
-			border: 1px solid blue;
-			margin: 1em;
-		}
-	</style>
-
-	<script type="text/javascript" src="../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
-	<script type="text/javascript">
-		dojo.require("dijit._WidgetBase");
-		dojo.require("dijit._OnDijitClickMixin");
-		dojo.require("dojo.parser");
-
-		dojo.ready(function(){
-			dojo.declare("WidgetWithOndijitclick", [dijit._WidgetBase, dijit._OnDijitClickMixin], {
-				clickCount: 0,
-				onClick: function(){
-				},
-				_onClick: function(){
-					this.clickCount++;
-					this.onClick();
-				},
-				postCreate: function(){
-					this.connect(this.domNode, "ondijitclick", "_onClick");
-				}
-			});
-
-			dojo.parser.parse();
-		});
-	</script>
-</head>
-<body class="claro">
-	<h1>_Widget.ondijitclick test</h1>
-	<p>
-		This tests dijit's infrastructure for catching SPACE and ENTER key clicks on nodes
-		that aren't &lt;button&gt; or &lt;a&gt;, and therefore don't normally respond to keyboard
-		"click events".
-	</p>
-	<p>
-		Clicking the first widget moves focus to the plain button,
-		but that button itself shouldn't get a click event.   (There are some subtleties about
-		whether catch clicks on key-down or key-up so this tests to make sure we are doing
-		the right one.)
-	</p>
-	<div id="first" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='
-			onClick:function(){ dojo.byId("plainbutton").focus(); }'>
-		click me using space or enter, to focus button below
-	</div>
-	<button id="plainbutton" onclick="console.log('plain button clicked'); window.clicked = true;" type="button" >plain button</button>
-
-	<div id="second" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='
-			onClick:function(){ dojo.byId("textarea").focus(); }'>
-		click me using space or enter, to focus textarea below
-	</div>
-	<textarea id="textarea">hello world</textarea>
-
-	<br>
-	<button id="plainbutton2" style="margin-top: 2em;" type="button"
-			onClick="dojo.byId('third').focus();">
-		click me using space or enter, to focus ondijitclick widget below
-	</button>
-	<div id="third" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='style:"margin-top: 0px;",
-			onFocus:function(){ console.log("onfocus on third"); window.onDijitClickFocus = true; },
-			onClick:function(){ console.log("onclick on third"); window.spuriousOnDijitClick = true; }'>
-		clicking the button above shouldn't cause my ondijitclick handler to fire
-	</div>
-	<br>
-	<div id="fourth" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='style:"margin-top: 0px;",
-			onClick:function(){ alert("make sure can close this alert via keyboard"); }'>
-		Manual Test: Click me using space or enter to launch a JavaScript alert() from element using ondijitclick
-	</div>
-	<br>
-	Clicking this button should produce exactly one click event to console:
-	<button id="widgetbutton" tabIndex="0" data-dojo-type="WidgetWithOndijitclick">
-		button w/ondijitclick
-	</button>
-
-	<div id="outer">
-		Test for bubble of click
-		<div id="inner">
-			<span data-dojo-type="WidgetWithOndijitclick" id="bubbleTestWidget" tabindex="0">click me</span>
-			<span data-dojo-type="WidgetWithOndijitclick" id="bubbleTestWidget2" tabindex="0">click me too</span>
-		</div>
-	</div>
-</body>
-</html>
diff --git a/tests/_Widget-subscribe.html b/tests/_Widget-subscribe.html
deleted file mode 100644
index 78d9aa36b..000000000
--- a/tests/_Widget-subscribe.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-
-	<title>Test Dijit Subscribe</title>
-
-	<script type="text/javascript" src="../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
-	<script type="text/javascript">
-		dojo.require("doh.runner");
-		dojo.require("dijit._Widget");
-		dojo.require("dojo.parser");
-
-		dojo.ready(function(){
-			var numCallsInternal = 0;
-			var numCallsExternal = 0;
-			var externalString = "";
-			var internalSubscribe = null;
-	
-			dojo.declare("MyWidget", dijit._Widget, {
-				_subscribeHandlerInternal: function(){ numCallsInternal++; }
-			});
-
-			doh.register("parse", function(){
-				dojo.parser.parse();
-			});
-
-			doh.register("_widgetSubscribe",
-				[
-					{
-						name: "_Widget.subscribe - set up subscriptions",
-						runTest: function(t){
-							var w = dijit.byId("widget1");
-							internalSubscribe = w.subscribe("/custom/event",
-													"_subscribeHandlerInternal");
-							w.subscribe("/custom/event", function(){
-								if(this == w){
-									numCallsExternal++;
-								}
-							});
-							w.subscribe("/custom/setString", function(str){
-								if(this == w){
-									externalString = str;
-								}
-							});
-							doh.is(0, numCallsInternal);
-							doh.is(0, numCallsExternal);
-							doh.is("", externalString);
-							doh.isNot(null, internalSubscribe);
-						}
-					},
-					{
-						name: "_Widget.subscribe - publish events",
-						runTest: function(t){
-							var w = dijit.byId("widget1");
-							dojo.publish("/custom/event", []);
-							doh.is(1, numCallsInternal);
-							doh.is(1, numCallsExternal);
-							dojo.publish("/custom/setString", ["myString"]);
-							doh.is("myString", externalString);
-							dojo.publish("/custom/setString", ["anotherString"]);
-							doh.is("anotherString", externalString);
-						}
-					},
-					{
-						name: "_Widget.unsubscribe",
-						runTest: function(t){
-							var w = dijit.byId("widget1");
-							dojo.publish("/custom/event", []);
-							doh.is(2, numCallsInternal, "numCallsInternal");
-							doh.is(2, numCallsExternal, "numCallsExternal");
-							w.unsubscribe(internalSubscribe);
-							dojo.publish("/custom/event", []);
-							doh.is(2, numCallsInternal, "numCallsInternal again");
-							doh.is(3, numCallsExternal, "numCallsExternal again");
-						}
-					},
-					{
-						name: "_Widget.destroy",
-						runTest: function(t){
-							var w = dijit.byId("widget1");
-							w.destroy();
-							dojo.publish("/custom/event", []);
-							doh.is(2, numCallsInternal, "numCallsInternal");
-							doh.is(3, numCallsExternal, "numCallsExternal");
-							dojo.publish("/custom/setString", ["myString"]);
-							doh.is("anotherString", externalString, "externalString");
-						}
-					}
-				]
-			);
-
-			doh.run();
-		});
-
-	</script>
-</head>
-<body class="claro">
-	<div id="widget1" data-dojo-type="MyWidget"></div>
-</body>
-</html>
diff --git a/tests/_WidgetsInTemplateMixin.html b/tests/_WidgetsInTemplateMixin.html
index a5146c1e5..ab415dfb3 100644
--- a/tests/_WidgetsInTemplateMixin.html
+++ b/tests/_WidgetsInTemplateMixin.html
@@ -27,7 +27,7 @@
 			require([
 				"doh", "dojo/_base/array", "dojo/_base/declare", "dojo/_base/window", "dojo/dom", "dojo/dom-geometry",
 				"dojo/html", "dojo/query", "dojo/parser",
-				"dijit/registry", "dijit/_WidgetBase", "dijit/_Widget",
+				"dijit/registry", "dijit/_WidgetBase",
 				"dijit/_AttachMixin", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin",
 				"dijit/form/Button", "dijit/form/CheckBox", "dijit/Editor",
 				"dijit/ProgressBar", "dijit/layout/ContentPane", "dijit/layout/TabContainer", "dijit/_Container",
@@ -35,7 +35,7 @@
 				"dijit/focus",
 				"dojo/domReady!"
 			], function(doh, array, declare, win, dom, domGeom, html, query, parser,
-					registry, _WidgetBase, _Widget, _AttachMixin, _TemplatedMixin, _WidgetsInTemplateMixin,
+					registry, _WidgetBase, _AttachMixin, _TemplatedMixin, _WidgetsInTemplateMixin,
 					Button, CheckBox, Editor, ProgressBar, ContentPane, TabContainer,
 					_Container, _Contained, _LayoutWidget, TestContextRequireWidget, focusUtil){
 
@@ -54,7 +54,7 @@
 					}
 				});
 
-				declare('Test3Widget', [_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
+				declare('Test3Widget', [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
 					templateString: dom.byId('Test3Template').value
 				});
 
diff --git a/tests/infrastructure-module.js b/tests/infrastructure-module.js
index 4385bddb5..03f32dbf6 100644
--- a/tests/infrastructure-module.js
+++ b/tests/infrastructure-module.js
@@ -13,12 +13,8 @@ define(["doh/main", "require"], function(doh, require){
 	// _Widget
 	doh.register("_Widget-lifecycle", require.toUrl("./_Widget-lifecycle.html"), 999999);
 	doh.register("_Widget-attr", require.toUrl("./_Widget-attr.html"), 999999);
-	doh.register("_Widget-subscribe", require.toUrl("./_Widget-subscribe.html"), 999999);
 	doh.register("_Widget-placeAt", require.toUrl("./_Widget-placeAt.html"), 999999);
 	doh.register("robot._Widget-on", require.toUrl("./_Widget-on.html"), 999999);
-	doh.register("robot._Widget-deferredConnect", require.toUrl("./robot/_Widget-deferredConnect.html"), 999999);
-	doh.register("robot._Widget-ondijitclick_mouse", require.toUrl("./robot/_Widget-ondijitclick_mouse.html"), 999999);
-	doh.register("robot._Widget-ondijitclick_a11y", require.toUrl("./robot/_Widget-ondijitclick_a11y.html"), 999999);
 
 	// _Templated and other mixins
 	doh.register("_AttachMixin", require.toUrl("./_AttachMixin.html"), 999999);
diff --git a/tests/layout/ContentPane.html b/tests/layout/ContentPane.html
index 63fcf8ee1..1e3698d5c 100644
--- a/tests/layout/ContentPane.html
+++ b/tests/layout/ContentPane.html
@@ -450,7 +450,7 @@
 
 			var nwStartupCalls = 0, nwDestroyCalls = 0;
 			declare("NonWidget", null, {
-				// summary: doesn't extend _Widget, used to test that startup() is still called
+				// summary: doesn't extend _WidgetBase, used to test that startup() is still called
 				startup: function(){
 					if(!this._started){
 						nwStartupCalls++;
diff --git a/tests/layout/test_BorderContainer_experimental.html b/tests/layout/test_BorderContainer_experimental.html
index 0ac04cec2..9872a3be3 100644
--- a/tests/layout/test_BorderContainer_experimental.html
+++ b/tests/layout/test_BorderContainer_experimental.html
@@ -130,7 +130,7 @@
 						this.layout();
 					},
 	
-					extractChild: function(/*dijit._Widget*/ child, /*DomNode*/ node){
+					extractChild: function(/*dijit._WidgetBase*/ child, /*DomNode*/ node){
 						// a non-destructive cleanup for the bordercontainer.
 						// cleanup a widget, and append it's domNode to some
 						// other node in the dom
diff --git a/tests/robot/_Widget-deferredConnect.html b/tests/robot/_Widget-deferredConnect.html
deleted file mode 100644
index 422eeb688..000000000
--- a/tests/robot/_Widget-deferredConnect.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<title>robot deferred connect tests</title>
-
-	<style>
-		@import "../../../util/doh/robot/robot.css";
-	</style>
-
-	<!-- required: dojo.js -->
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true, async: true"></script>
-
-	<script type="text/javascript">
-		require([
-			"doh/runner", "dojo/robotx", "dojo/domReady!"
-		], function(doh, robot){
-			robot.initRobot('../_Widget-deferredConnect.html');
-
-			// Test that deferred connections get set up correctly when they need to be
-			// (_Widget only does the dojo.connect() for onmousemove if it needs to)
-			doh.register("deferredConnect", [
-				{
-					name: "mouse move on widget where onmousemove overridden",
-					timeout: 5000,
-					runTest: function(){
-						var d = new doh.Deferred();
-						robot.mouseMoveAt("overrode", 500);
-						robot.sequence(d.getTestCallback(function(){
-							doh.t(robot.window.overrodeMouseMoved, "overrode button event handler fired");
-						}), 500);
-						return d;
-					}
-				},
-				{
-					name: "mouse move on widget where onmousemove connected",
-					timeout: 5000,
-					runTest: function(){
-						var d = new doh.Deferred();
-						robot.mouseMoveAt("connect", 500);
-
-						robot.sequence(d.getTestCallback(function(){
-							doh.t(robot.window.connectedMouseMoved, "connected button event handler fired");
-						}), 500);
-						return d;
-					}
-				},
-				{
-					name: "mouse move on widget where onmousemove overridden and connected",
-					timeout: 5000,
-					runTest: function(){
-						var d = new doh.Deferred();
-						robot.mouseMoveAt("both", 500);
-
-						robot.sequence(d.getTestCallback(function(){
-							doh.t(robot.window.bothOverrodeMouseMoved, "dojo/method handler fired");
-							doh.t(robot.window.bothConnectedMouseMoved, "dojo/connect handler fired");
-						}), 500);
-						return d;
-					}
-				}
-			]);
-
-			doh.run();
-		});
-	</script>
-</head>
-</html>
diff --git a/tests/robot/_Widget-ondijitclick_a11y.html b/tests/robot/_Widget-ondijitclick_a11y.html
deleted file mode 100644
index e598c2a67..000000000
--- a/tests/robot/_Widget-ondijitclick_a11y.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-
-	<title>Test Dijit Internal Event: "ondijitclick"</title>
-
-	<script type="text/javascript" src="../../../dojo/dojo.js" data-dojo-config="isDebug: true, async: true"></script>
-	<script type="text/javascript">
-		require([
-			"doh/runner", "dojo/robotx",
-			"dojo/_base/array", "dojo/aspect", "dojo/dom", "dojo/keys", "dojo/on", "dojo/domReady!"
-		], function(doh, robot, array, aspect, dom, keys, on){
-
-			robot.initRobot('../_Widget-ondijitclick.html');
-
-			// Event monitoring
-			var widgetClicks = 0, buttonClicks = 0, button2Clicks = 0, thirdClicks = 0;
-			var w;
-
-			doh.register(function setup(){
-				// get pointer to registry in the iframe
-				registry = robot.window.require("dijit/registry");
-			});
-
-			doh.register("setup", function(){
-				robot.sequence(function(){
-					w = registry.byId("first");
-					aspect.after(w, "_onClick", function(){
-						widgetClicks++;
-					}, true);
-					on(dom.byId("plainbutton", robot.doc), "click", function(){
-						buttonClicks++;
-					});
-					on(dom.byId("plainbutton2", robot.doc), "click", function(){
-						button2Clicks++;
-					});
-					on(dom.byId("third", robot.doc), "click", function(){
-						thirdClicks++;
-					});
-				});
-			});
-
-			// Test ondijitclick on a <div> which refocuses onto a native <button> node.
-			// Make sure that the <button> doesn't get a spurious click event.
-			array.forEach(["SPACE", "ENTER"], function(key){
-
-				doh.register("ondijitclick by " + key, [
-					{
-						name: "ondijitclick by " + key,
-						timeout: 5000,
-						runTest: function(){
-							widgetClicks = buttonClicks = 0;
-							var d = new doh.Deferred();
-
-							// Keyboard-click the widget
-							robot.sequence(function(){
-								w.domNode.focus();
-							}, 500);
-							robot.keyDown(keys[key], 250, {});
-							robot.keyUp(keys[key], 250, {});
-
-							// Check that ondijitclick fired but no spurious event
-							// on the widget that got focused in the ondijitclick handler
-							robot.sequence(d.getTestCallback(function(){
-								doh.is(1, widgetClicks, "ondijitclick handler fired");
-								doh.is(0, buttonClicks, "spurious button click event");
-							}), 500);
-
-							return d;
-						}
-					},
-					{
-						name: "ondijitclick by " + key + " w/modifier",
-						timeout: 5000,
-						runTest: function(){
-							widgetClicks = buttonClicks = 0;
-							var d = new doh.Deferred();
-
-							robot.sequence(function(){
-								w.domNode.focus();
-							}, 500);
-				
-							// Try shift-space/shift-enter just to make sure it doesn't do anything.
-							// Don't try ctrl-space or meta-space since those keystrokes have special functions
-							// (like context menu) in various browsers
-							robot.keyPress(keys[key], 100, {shift: true});
-
-							// Check that ondijitclick didn't fire
-							robot.sequence(d.getTestCallback(function(){
-								doh.is(0, widgetClicks, "ondijitclick handler wasn't fired");
-								doh.is(0, buttonClicks, "button click handler wasn't fired");
-							}), 500);
-
-							return d;
-						}
-					}
-				]);
-			});
-
-			// Test ondijitclick on a <div> which refocuses onto a native <textarea> node.
-			// Tests that the keyboard event gets supressed so it doesn't modify the focused node.
-			array.forEach(["SPACE","ENTER"], function(key){
-
-				doh.register("focus to textarea by " + key, [
-					{
-						name: "ondijitclick by " + key,
-						timeout: 5000,
-						runTest: function(){
-							var d = new doh.Deferred(),
-								w = registry.byId("second");
-
-							// Keyboard-click the widget
-							robot.sequence(function(){
-								w.domNode.focus();
-							}, 500);
-							robot.keyPress(keys[key], 500, {});
-
-							// Check that ondijitclick fired but that focused textarea didn't get the key
-							robot.sequence(d.getTestCallback(function(){
-								doh.is("hello world", dom.byId("textarea", robot.doc).value);
-							}), 500);
-
-							return d;
-						}
-					}
-				]);
-			});
-
-			// Test onclick on a <button> which refocuses onto a <div> w/an ondijitclick handler.
-			// Make sure that the <div> doesn't get a spurious click event.
-			array.forEach(["SPACE", "ENTER"], function(key){
-
-				doh.register("focus to ondijitclick-div by " + key, [
-					{
-						name: "click by " + key,
-						timeout: 5000,
-						runTest: function(){
-							button2Clicks = thirdClicks = 0;
-
-							var d = new doh.Deferred(),
-								button = dom.byId("plainbutton2", robot.doc);
-
-							// Keyboard-click the native button
-							robot.sequence(function(){
-								button.focus();
-							}, 500);
-							robot.keyPress(keys[key], 500, {});
-
-							// Check that ondijitclick didn't fire
-							robot.sequence(d.getTestCallback(function(){
-								doh.is(1, button2Clicks, "button2 was clicked (and focus moved to ondijitclick-div)");
-								doh.is(0, thirdClicks, "ondijitclick-div didn't get a spurious click event");
-							}), 500);
-
-							return d;
-						}
-					}
-				]);
-			});
-
-			// Test clicking on a <button> with an ondijitclick handler.
-			// The main danger is getting two click events because the browser natively handles space-->click
-			array.forEach(["SPACE", "ENTER"], function(key){
-
-				doh.register("click ondijitclick button by " + key, [
-					{
-						name: "click by " + key,
-						timeout: 5000,
-						runTest: function(){
-
-							var d = new doh.Deferred(),
-								buttonWidget = registry.byId("widgetbutton"),
-								buttonNode = dom.byId("widgetbutton", robot.doc);
-
-							buttonWidget.clickCount = 0;
-
-							// Keyboard-click the widget button
-							robot.sequence(function(){
-								buttonNode.focus();
-							}, 500);
-							robot.keyPress(keys[key], 500, {});
-
-							// Check that ondijitclick fired exactly once
-							robot.sequence(d.getTestCallback(function(){
-								doh.is(1, buttonWidget.clickCount, "one click event");
-							}), 500);
-
-							return d;
-						}
-					}
-				]);
-			});
-
-			doh.register("bubbling", [
-				{
-					name: "bubbling",
-					timeout: 5000,
-					runTest: function(){
-
-						var d = new doh.Deferred(),
-							outerDiv = dom.byId("outer", robot.doc),
-							buttonNode = dom.byId("bubbleTestWidget", robot.doc),
-							buttonWidget = registry.byId("bubbleTestWidget");
-
-						// Listen for click events on the outer DOMNode.
-						var clicks = 0;
-						on(outerDiv, "click", function(){
-							clicks++;
-						});
-
-						// Keyboard-click the widget button
-						robot.sequence(function(){
-							buttonNode.focus();
-						}, 500);
-						robot.keyPress(keys.ENTER, 500, {});
-
-						// Check that one click event bubbled
-						robot.sequence(d.getTestCallback(function(){
-							doh.is(1, buttonWidget.clickCount, "one click event");
-							doh.is(1, clicks, "one click event bubbled");
-						}), 500);
-
-						return d;
-					}
-				}
-			]);
-
-			doh.run();
-		});
-
-	</script>
-</head>
-</html>
diff --git a/tests/robot/_Widget-ondijitclick_mouse.html b/tests/robot/_Widget-ondijitclick_mouse.html
deleted file mode 100644
index 62d4a4176..000000000
--- a/tests/robot/_Widget-ondijitclick_mouse.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-
-	<title>Test Dijit Internal Event: "ondijitclick"</title>
-
-	<script type="text/javascript" src="../../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
-	<script type="text/javascript">
-		require([
-			"doh/runner", "dojo/robotx",
-			"dojo/aspect", "dojo/dom", "dojo/on", "dojo/domReady!"
-		], function(doh, robot, aspect, dom, on){
-
-			robot.initRobot('../_Widget-ondijitclick.html');
-
-			// Event monitoring
-			var widgetClicks = 0, buttonClicks = 0;
-			var w;
-
-			doh.register(function setup(){
-				// get pointer to registry in the iframe
-				registry = robot.window.require("dijit/registry");
-			});
-
-			doh.register("ondijitclick w/mouse", {
-				timeout:5000,
-				runTest:function(){
-					var d = new doh.Deferred();
-
-					robot.sequence(function(){
-						w = registry.byId("first");
-						aspect.after(w, "_onClick", function(){
-							widgetClicks++;
-						}, true);
-						on(dom.byId("plainbutton", robot.doc), "click", function(){
-							buttonClicks++;
-						});
-						w.domNode.focus();
-					}, 100);
-
-					// click the widget
-					robot.mouseMoveAt("first", 500);
-					robot.mouseClick({left: true}, 500);
-
-					robot.sequence(d.getTestCallback(function(){
-						doh.is(1, widgetClicks, "ondijitclick handler fired once");
-					}), 1000);
-
-					return d;
-				}
-			});
-
-			// Test clicking on a <button> with an ondijitclick handler.
-			doh.register("click ondijitclick button", [
-				{
-					name: "click",
-					timeout: 5000,
-					runTest: function(){
-
-						var d = new doh.Deferred(),
-							buttonWidget = registry.byId("widgetbutton");
-
-						buttonWidget.clickCount = 0;
-
-						robot.mouseMoveAt("widgetbutton", 500);
-						robot.mouseClick({left: true}, 500);
-
-						// Check that ondijitclick fired exactly once
-						robot.sequence(d.getTestCallback(function(){
-							doh.is(1, buttonWidget.clickCount, "one click event");
-						}), 500);
-
-						return d;
-					}
-				}
-			]);
-
-			doh.register("bubbling", [
-				{
-					name: "bubbling",
-					timeout: 5000,
-					runTest: function(){
-
-						var d = new doh.Deferred(),
-							outerDiv = dom.byId("outer", robot.doc),
-							buttonNode = dom.byId("bubbleTestWidget", robot.doc),
-							buttonWidget = registry.byId("bubbleTestWidget");
-
-						// Listen for click events on the outer DOMNode.
-						var clicks = 0;
-						on(outerDiv, "click", function(){
-							clicks++;
-						});
-
-						// click the widget button
-						robot.mouseMoveAt("bubbleTestWidget", 500);
-						robot.mouseClick({left: true}, 500);
-
-						// Check that one click event bubbled
-						robot.sequence(d.getTestCallback(function(){
-							doh.is(1, buttonWidget.clickCount, "one click event");
-							doh.is(1, clicks, "one click event bubbled");
-						}), 500);
-
-						return d;
-					}
-				}
-			]);
-
-			doh.run();
-		});
-
-	</script>
-</head>
-</html>
diff --git a/tests/test_TooltipDialog.html b/tests/test_TooltipDialog.html
index 655af8efd..714a78718 100644
--- a/tests/test_TooltipDialog.html
+++ b/tests/test_TooltipDialog.html
@@ -41,7 +41,7 @@
 	<script type="text/javascript" src="_testCommon.js"></script>
 
 	<script type="text/javascript">
-		dojo.require("dijit._Widget");
+		dojo.require("dijit._WidgetBase");
 		dojo.require("dijit._TemplatedMixin");
 
 		dojo.require("dijit.TooltipDialog");
@@ -70,7 +70,7 @@
 		dojo.ready(function(){
 			// create a do nothing, only for test widget
 			dojo.declare("TestWidget",
-				[dijit._Widget, dijit._TemplatedMixin], {
+				[dijit._WidgetBase, dijit._TemplatedMixin], {
 				templateString: "<div style='margin: 10px; border: inset #700 4px; padding: 5px;' dojoAttachPoint='containerNode'></div>"
 			});