diff --git a/src/aui-base/js/aui-loader.js b/src/aui-base/js/aui-loader.js
index 876a8f31dbd..53921d5c8e1 100644
--- a/src/aui-base/js/aui-loader.js
+++ b/src/aui-base/js/aui-loader.js
@@ -1187,8 +1187,7 @@ Y.mix(YUI.Env[Y.version].modules, {
     },
     "aui-timepicker": {
         "requires": [
-            "autocomplete-list",
-            "autocomplete-list-keys",
+            "autocomplete",
             "aui-datepicker-delegate",
             "aui-datepicker-popover"
         ],
@@ -1247,7 +1246,7 @@ Y.mix(YUI.Env[Y.version].modules, {
     },
     "aui-tooltip-base": {
         "requires": [
-            "event-mouseenter",
+            "event-hover",
             "transition",
             "widget",
             "widget-autohide",
@@ -1416,4 +1415,4 @@ Y.mix(YUI.Env[Y.version].modules, {
         ]
     }
 });
-YUI.Env[Y.version].md5 = 'b686029fbc7b1029267a057f36ea552f';
+YUI.Env[Y.version].md5 = '558fb4cc2205a9dffcee7fee0949f05c';
diff --git a/src/aui-base/js/aui-loader.json b/src/aui-base/js/aui-loader.json
index 577a55eab0c..27d008bae07 100644
--- a/src/aui-base/js/aui-loader.json
+++ b/src/aui-base/js/aui-loader.json
@@ -1163,8 +1163,7 @@
     },
     "aui-timepicker": {
         "requires": [
-            "autocomplete-list",
-            "autocomplete-list-keys",
+            "autocomplete",
             "aui-datepicker-delegate",
             "aui-datepicker-popover"
         ],
@@ -1223,7 +1222,7 @@
     },
     "aui-tooltip-base": {
         "requires": [
-            "event-mouseenter",
+            "event-hover",
             "transition",
             "widget",
             "widget-autohide",