diff --git a/admin_views.views_default.inc b/admin_views.views_default.inc
index 57e6818..f13736f 100644
--- a/admin_views.views_default.inc
+++ b/admin_views.views_default.inc
@@ -9,20 +9,32 @@
  * Implements hook_views_default_views().
  */
 function admin_views_views_default_views() {
-  static $views;
+  // @todo This static might need to re-evaluate whether the originating module
+  //   of an default admin view exists when invoked more than once (potentially
+  //   during or after drupal_flush_all_caches()).
+  $views = &drupal_static(__FUNCTION__);
 
   if (isset($views)) {
     return $views;
   }
 
-  $files = file_scan_directory(drupal_get_path('module', 'admin_views') . '/views_default', '/\.inc$/');
-  foreach ($files as $filepath => $file) {
-    include $filepath;
-    if (isset($view)) {
-      // Only provide the view if the corresponding module exists.
-      $schema = drupal_get_schema($view->base_table);
-      if (!empty($schema) && module_exists($schema['module'])) {
-        $views[$view->name] = $view;
+  // Collect all modules providing admin_views_default.
+  $modules = module_list();
+  foreach ($modules as $module) {
+    $dir = DRUPAL_ROOT . '/' . drupal_get_path('module', $module) . '/admin_views_default';
+    if (is_dir($dir)) {
+      // Scan each admin_views_default directory for provided default views.
+      foreach (file_scan_directory($dir, '/\.inc$/') as $filepath => $file) {
+        // Extract the primary module dependency of the default admin view, which
+        // is the filename prefix delimited by a period/dot; e.g.,
+        // 'taxonomy.foo-bar.inc', and only include it if that module is enabled.
+        $dependency = strtok($file->filename, '.');
+        if (isset($modules[$dependency])) {
+          include $filepath;
+          if (isset($view)) {
+            $views[$view->name] = $view;
+          }
+        }
       }
     }
   }
diff --git a/views_default/admin_content_comment.inc b/admin_views_default/comment.admin-content-comment.inc
similarity index 100%
rename from views_default/admin_content_comment.inc
rename to admin_views_default/comment.admin-content-comment.inc
diff --git a/views_default/admin_content_node.inc b/admin_views_default/node.admin-content.inc
similarity index 100%
rename from views_default/admin_content_node.inc
rename to admin_views_default/node.admin-content.inc
diff --git a/views_default/admin_content_taxonomy.inc b/admin_views_default/taxonomy.admin-content-taxonomy.inc
similarity index 100%
rename from views_default/admin_content_taxonomy.inc
rename to admin_views_default/taxonomy.admin-content-taxonomy.inc
diff --git a/views_default/admin_user_user.inc b/admin_views_default/user.admin-people.inc
similarity index 100%
rename from views_default/admin_user_user.inc
rename to admin_views_default/user.admin-people.inc