Index: wp-admin/edit-tag-form.php
===================================================================
--- wp-admin/edit-tag-form.php	(revision 13007)
+++ wp-admin/edit-tag-form.php	(working copy)
@@ -19,11 +19,9 @@
 	return;
 }
 
-if ( 'category' == $taxonomy )
-	do_action('edit_category_form_pre', $tag );
-else
+if ( !is_taxonomy_hierarchical($taxonomy) )
 	do_action('edit_tag_form_pre', $tag);
-do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy);  ?>
+do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy);  ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
@@ -65,16 +63,16 @@
 			do_action('edit_category_form_fields', $tag);
 		else
 			do_action('edit_tag_form_fields', $tag);
-		do_action('edit_' . $taxonomy . '_form_fields', $tag, $taxonomy);
+		do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
 		?>
 	</table>
 <p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
 <?php 
 if ( 'category' == $taxonomy ) 
-	do_action('edit_category_form_', $tag);
+	do_action('edit_category_form', $tag);
 else
-	do_action('edit_tag_form_', $tag);
-do_action('edit_' . $taxonomy . '_form', $tag, $taxonomy);
+	do_action('edit_tag_form', $tag);
+do_action($taxonomy . '_edit_form', $tag, $taxonomy);
 ?>
 </form>
 </div>
Index: wp-admin/edit-tags.php
===================================================================
--- wp-admin/edit-tags.php	(revision 13007)
+++ wp-admin/edit-tags.php	(working copy)
@@ -293,7 +293,7 @@
 		do_action('add_category_form_pre', (object)array('parent' => 0) );
 	else
 		do_action('add_tag_form_pre', $taxonomy);
-	do_action('add_' . $taxonomy . '_form_pre', $taxonomy);
+	do_action($taxonomy . '_pre_add_form', $taxonomy);
 ?>
 
 <div class="form-wrap">
@@ -329,11 +329,9 @@
 </div>
 
 <?php 
-if ( 'category' == $taxonomy ) 
-	do_action('add_category_form_fields');
-else
+if ( ! is_taxonomy_hierarchical($taxonomy) ) 
 	do_action('add_tag_form_fields', $taxonomy);
-do_action('add_' . $taxonomy . '_form_fields', $taxonomy);
+do_action($taxonomy . '_add_form_fields', $taxonomy);
 ?>
 
 <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
@@ -342,7 +340,7 @@
 	do_action('edit_category_form',	(object)array('parent' => 0) );
 else
 	do_action('add_tag_form', $taxonomy);
-do_action('add_' . $taxonomy . '_form', $taxonomy);
+do_action($taxonomy . '_add_form', $taxonomy);
 ?>
 </form></div>
 <?php } ?>