Index: wp-admin/edit-tags.php
===================================================================
--- wp-admin/edit-tags.php	(revision 13020)
+++ wp-admin/edit-tags.php	(working copy)
@@ -290,10 +290,11 @@
 
 <?php if ( current_user_can($tax->edit_cap) ) {
 	if ( 'category' == $taxonomy )
-		do_action('add_category_form_pre', (object)array('parent' => 0) );
+		do_action('add_category_form_pre', (object) array( 'parent' => 0 ) ); // Back compat hook. Deprecated.
 	else
-		do_action('add_tag_form_pre', $taxonomy);
-	do_action('add_' . $taxonomy . '_form_pre', $taxonomy);
+		do_action('add_tag_form_pre', $taxonomy); // Back compat hook. Deprecated.
+
+	do_action( $taxonomy . '_add_form_pre', $taxonomy); // Use this one.
 ?>
 
 <div class="form-wrap">
@@ -329,20 +330,20 @@
 </div>
 
 <?php 
-if ( 'category' == $taxonomy ) 
-	do_action('add_category_form_fields');
-else
-	do_action('add_tag_form_fields', $taxonomy);
-do_action('add_' . $taxonomy . '_form_fields', $taxonomy);
+if ( 'category' != $taxonomy )
+	do_action('add_tag_form_fields', $taxonomy); // Back compat hook. Deprecated.
+
+do_action($taxonomy . '_add_form_fields', $taxonomy); // Use this one.
 ?>
 
 <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
 <?php
 if ( 'category' == $taxonomy )
-	do_action('edit_category_form',	(object)array('parent' => 0) );
+	do_action('edit_category_form',	(object) array( 'parent' => 0 ) ); // Back compat hook. Deprecated.
 else
-	do_action('add_tag_form', $taxonomy);
-do_action('add_' . $taxonomy . '_form', $taxonomy);
+	do_action('add_tag_form', $taxonomy); // Back compat hook. Deprecated.
+
+do_action($taxonomy . '_add_form', $taxonomy); // Use this one.
 ?>
 </form></div>
 <?php } ?>
Index: wp-admin/edit-tag-form.php
===================================================================
--- wp-admin/edit-tag-form.php	(revision 13020)
+++ wp-admin/edit-tag-form.php	(working copy)
@@ -20,11 +20,13 @@
 }
 
 if ( 'category' == $taxonomy )
-	do_action('edit_category_form_pre', $tag );
+	do_action('edit_category_form_pre', $tag ); // Back compat hook. Deprecated.
 else
-	do_action('edit_tag_form_pre', $tag);
-do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy);  ?>
+	do_action('edit_tag_form_pre', $tag); // Back compat hook. Deprecated.
 
+do_action($taxonomy . '_edit_form_pre', $tag, $taxonomy); // Use this one.
+?>
+
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Edit Tag'); ?></h2>
@@ -62,19 +64,21 @@
 		</tr>
 		<?php
 		if ( 'category' == $taxonomy ) 
-			do_action('edit_category_form_fields', $tag);
+			do_action('edit_category_form_fields', $tag); // Back compat hook. Deprecated.
 		else
-			do_action('edit_tag_form_fields', $tag);
-		do_action('edit_' . $taxonomy . '_form_fields', $tag, $taxonomy);
+			do_action('edit_tag_form_fields', $tag); // Back compat hook. Deprecated.
+
+		do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy); // Use this one.
 		?>
 	</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);
+if ( 'category' == $taxonomy )
+	do_action('edit_category_form', $tag); // Back compat hook. Deprecated.
 else
-	do_action('edit_tag_form_', $tag);
-do_action('edit_' . $taxonomy . '_form', $tag, $taxonomy);
+	do_action('edit_tag_form', $tag); // Back compat hook. Deprecated.
+
+do_action($taxonomy . '_edit_form', $tag, $taxonomy); // Use this one.
 ?>
 </form>
 </div>