diff --git a/data_ui/data_ui.admin.inc b/data_ui/data_ui.admin.inc
index 7e31d841b60177a77c39de54f1e4a1bf63f23960..1b8a1a7586e53d10d84155e1d5faf3dd6af5fd07 100644
--- a/data_ui/data_ui.admin.inc
+++ b/data_ui/data_ui.admin.inc
@@ -329,7 +329,7 @@ function data_ui_create_form(&$form_state) {
  * Validate handler for create table form.
  */
 function data_ui_create_form_validate($form, &$form_state) {
-  if (data_get_table(data_name($form_state['values']['name']))) {
+  if (data_get_table(trim($form_state['storage']['name']))) {
     form_set_error('name', t('Name is already taken.'));
   }
   if (isset($form_state['values']['field_num'])) {
@@ -387,7 +387,7 @@ function data_ui_create_form_submit($form, &$form_state) {
     $schema['primary key'] = $primary;
 
     // Create table.
-    if ($table = data_create_table(data_name(trim($form_state['storage']['name'])), $schema, trim($form_state['storage']['title']))) {
+    if ($table = data_create_table(trim($form_state['storage']['name']), $schema, trim($form_state['storage']['title']))) {
       $meta = $table->update(array('meta' => $meta));
       drupal_set_message(t('Created table !table', array('!table' => $table->get('name'))));
     }