Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.599
diff -u -p -r1.599 theme.inc
--- includes/theme.inc	7 Jun 2010 06:38:09 -0000	1.599
+++ includes/theme.inc	11 Jun 2010 02:27:12 -0000
@@ -2461,9 +2461,8 @@ function template_preprocess_region(&$va
   $variables['content'] = $variables['elements']['#children'];
   $variables['region'] = $variables['elements']['#region'];
 
-  $region = drupal_region_class($variables['region']);
-  $variables['classes_array'][] = $region;
-  $variables['theme_hook_suggestions'][] = 'region__' . $region;
+  $variables['classes_array'][] = drupal_region_class($variables['region']);
+  $variables['theme_hook_suggestions'][] = 'region__' . $variables['region'];
 }
 
 /**
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.594
diff -u -p -r1.594 taxonomy.module
--- modules/taxonomy/taxonomy.module	4 Jun 2010 20:34:44 -0000	1.594
+++ modules/taxonomy/taxonomy.module	11 Jun 2010 02:27:14 -0000
@@ -639,14 +639,12 @@ function template_preprocess_taxonomy_te
   // languages.
   field_attach_preprocess('taxonomy_term', $term, $variables['content'], $variables);
 
+  // Gather classes, and clean up name so there are no underscores.
   $vocabulary_name_css = str_replace('_', '-', $term->vocabulary_machine_name);
-
-  // Gather classes.
   $variables['classes_array'][] = 'vocabulary-' . $vocabulary_name_css;
 
-  // Clean up name so there are no underscores.
-  $variables['theme_hook_suggestions'][] = 'taxonomy-term__' . $vocabulary_name_css;
-  $variables['theme_hook_suggestions'][] = 'taxonomy-term__' . $term->tid;
+  $variables['theme_hook_suggestions'][] = 'taxonomy_term__' . $term->vocabulary_machine_name;
+  $variables['theme_hook_suggestions'][] = 'taxonomy_term__' . $term->tid;
 }
 
 /**