Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.415.2.5
diff -u -p -r1.415.2.5 theme.inc
--- includes/theme.inc	15 May 2008 18:07:34 -0000	1.415.2.5
+++ includes/theme.inc	14 Jun 2008 17:41:56 -0000
@@ -1895,7 +1895,7 @@ function template_preprocess_node(&$vari
     $variables['picture'] = '';
   }
   // Clean up name so there are no underscores.
-  $variables['template_files'][] = 'node-'. $node->type;
+  $variables['template_files'][] = 'node-'. str_replace('_', '-', $node->type);
 }
 
 /**