diff --git a/data_ui/data_ui.admin.inc b/data_ui/data_ui.admin.inc
index 1f77f65..a9422be 100644
--- a/data_ui/data_ui.admin.inc
+++ b/data_ui/data_ui.admin.inc
@@ -241,31 +241,35 @@ function data_ui_adjust_form_submit_create_table($form, &$form_state) {
 /**
  * Form callback for adopt table form.
  *
- * 'Orphaned' tables are database tables that don't have an active schema
+ * 'Adotpable' tables are database tables that don't have an active schema
  * definition.
  */
 function data_ui_adopt_form($form, $form_state) {
   $form = array();
 
-  // Compile a list of orphaned tables.
-  $drupal_schema = drupal_get_schema(NULL, TRUE);
+  // Compile a list of available tables.
+  $tables = data_get_all_tables();
+  $data_tables = array();
+  foreach ($tables as $table => $definitiion) {
+    $data_tables[] = $table;
+  }
   $db_schema = schema_dbobject()->inspect();
-  $orphaned_tables = array();
+  $adoptable_tables = array();
   foreach ($db_schema as $name => $table) {
-    if (!isset($drupal_schema[$name])) {
-      $orphaned_tables[$name] = $name;
+    if (!in_array($name, $data_tables)) {
+      $adoptable_tables[$name] = $name;
     }
   }
 
-  $form['orphaned_tables'] = array(
+  $form['adoptable_tables'] = array(
     '#type' => 'checkboxes',
-    '#title' => t('Orphaned Tables'),
-    '#options' => $orphaned_tables,
+    '#title' => t('Adobtable Tables'),
+    '#options' => $adoptable_tables,
   );
-  if (count($orphaned_tables) < 1) {
-    $form['no_orphaned_tables'] = array(
+  if (count($adoptable_tables) < 1) {
+    $form['no_adoptable_tables'] = array(
       '#type' => 'item',
-      '#value' => t('There are no orphaned tables in your database.'),
+      '#value' => t('There are no adobtable tables in your database.'),
     );
   }
   $form['submit'] = array(
@@ -279,7 +283,7 @@ function data_ui_adopt_form($form, $form_state) {
  * Submit handler for adopt table form.
  */
 function data_ui_adopt_form_submit($form, &$form_state) {
-  $tables = array_keys(array_filter($form_state['values']['orphaned_tables']));
+  $tables = array_keys(array_filter($form_state['values']['adoptable_tables']));
   foreach ($tables as $table_name) {
     $table = DataTable::instance($table_name);
     $table->adopt();