--- event.module.ori	2006-05-09 08:01:10.000000000 +0700
+++ event.module	2006-06-08 14:46:26.000000000 +0700
@@ -280,7 +280,7 @@
           $filter[] = $ctype->name;
         }
       }
-      elseif ($name = module_hook($type, 'node_name')) {
+      elseif ($name = node_get_name($type)) {
         $x = module_invoke($type, 'node_name', $node);
         $temp[$x] = $type;
         $filter[] = module_invoke($type, 'node_name', $node);
@@ -1638,12 +1638,7 @@
 
     $items['all'] = t('(all)');
     foreach ($results as $type) {
-      if (module_hook($type, 'node_name')) {
-        $items[$type] = module_invoke($type, 'node_name', $node);
-      }
-      elseif ($ctype = module_invoke('flexinode', 'load_content_type', substr($type, 10))) {
-        $items[$type] = $ctype->name;
-      }
+      if(node_get_name($type))$items[$type] = node_get_name($type);
     }
 
     $form['event_type_select'] = array(
@@ -1652,7 +1647,7 @@
       '#options' => $items,
       '#description' => t('Select event type to filter by'));
     if ($autosubmit) {
-      $form['event_term_select']['#attributes'] = array('onChange'=>'this.form.submit()');
+      $form['event_type_select']['#attributes'] = array('onChange'=>'this.form.submit()');
     }
 
     $form = drupal_get_form('event_type_filter', $form);