--- opencalais.module	2011-06-28 04:17:32.000000000 +0800
+++ opencalais_new.module	2011-06-29 15:29:51.000000000 +0800
@@ -94,7 +94,7 @@
  */
 function opencalais_form_node_form_alter(&$form, &$form_state, $form_id) {  
   $node = $form['#node'];
-  $fields = opencalais_get_opencalais_tag_fields($form, 'node', $node->type); 
+  $fields = opencalais_get_opencalais_tag_fields($form, 'node', $node->type);
   $extra = array();
 
   foreach ($fields as $opencalais_type => $field_name) {
@@ -237,6 +237,7 @@
 function opencalais_get_opencalais_tag_fields($form, $entity, $bundle) {
   $fields = array();
   $entities = opencalais_get_all_entities();
+  foreach($entities as $key=>$item) $entities[$key] = opencalais_make_machine_name($item);
   $instances = field_info_instances($entity, $bundle);
   foreach ($instances as $field_name => $instance) {
     
@@ -259,7 +260,7 @@
 function opencalais_suggest_tags_callback($form, &$form_state, $norebuild=FALSE) {
   $form_state['opencalais_building'] = true;
   $node = node_form_submit_build_node($form, $form_state);  
-    $form_state['opencalais_building'] = false;  
+  $form_state['opencalais_building'] = false;  
   $fields = opencalais_get_opencalais_tag_fields($form, 'node', $node->type);
   
   // Load suggestions  
@@ -300,7 +301,7 @@
  * Gracefully handle JS degredation by providing a multi-step form implementation
  */
 function opencalais_suggest_tags_submit($form, &$form_state) {
-  $node = node_form_submit_build_node($form, $form_state);  
+  $node = node_form_submit_build_node($form, $form_state);
   $suggestions = opencalais_get_suggestions($node);
 }
 
@@ -349,7 +350,8 @@
           );
         }
       }  
-      $suggestions[$type] = $terms;
+      $machine_name = opencalais_make_machine_name($type);
+      $suggestions[$machine_name] = $terms;
     }   
   }
 
@@ -560,7 +562,7 @@
    $field['cardinality'] = FIELD_CARDINALITY_UNLIMITED;
    //limit to the proper taxonomy name
    $field['settings']['allowed_values'][0] = array(
-     'vocabulary' => $taxonomy_name,
+     'vocabulary' => opencalais_make_machine_name($taxonomy_name),
      'parent' => 0,
    );
 
@@ -658,7 +660,7 @@
    $fields = field_info_instances('node', $content_type);
    
    $entities = opencalais_get_all_entities();
-   
+   foreach($entities as $key=>$item) $entities[$key] = opencalais_make_machine_name($item);
    $existing = array();
    
    //fields will be an empty array if no instances are found
@@ -672,7 +674,7 @@
        }
      }
    }
-
+   
    return $existing;
  }
  
@@ -697,8 +699,8 @@
     
     $form = array();
     
-    $opencalais_entities = opencalais_get_all_entities();
-    _opencalais_make_keys($opencalais_entities);
+    $opencalais_entities = opencalais_get_all_entities();  
+    _opencalais_make_keys($opencalais_entities);    
     
     $existing = opencalais_get_fields_for_content_type($content_type);
     
@@ -716,15 +718,15 @@
     $entity_defaults = isset($item->config['entities']) ? $item->config['entities'] : array('enabled' => FALSE, 'threshold' => 0.0);
     
     foreach ($entities as $entity) {
-     
+      $machine_name = opencalais_make_machine_name($entity);
       $defaults = isset($entity_defaults[$entity]) ? $entity_defaults[$entity] : $entity_defaults;
       //load in defaults for existing fields
-      $defaults['enabled'] = isset($existing[$entity]) ? TRUE : FALSE;
-      $defaults['threshold'] = isset($existing[$entity]) ? $existing[$entity]['threshold'] : $defaults['threshold'];
+      $defaults['enabled'] = isset($existing[$machine_name]) ? TRUE : FALSE;
+      $defaults['threshold'] = isset($existing[$machine_name]) ? $existing[$machine_name]['threshold'] : $defaults['threshold'];
       
       $form['info']['config']['entities'][$entity]['existing'] = array(
         '#type' => 'hidden',
-        '#value' => isset($existing[$entity]) ? TRUE : FALSE
+        '#value' => isset($existing[$machine_name]) ? TRUE : FALSE
       );
       
       $form['info']['config']['entities'][$entity]['enabled'] = array(