diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index c98e32fb97..05a9b29476 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -231,7 +231,6 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 /**
  * Create HTML list of nav menu input items.
  *
- * @package WordPress
  * @since 3.0.0
  * @uses Walker_Nav_Menu
  */
diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php
index c98b28cc30..c654a92b06 100644
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -43,8 +43,7 @@ if ( ! function_exists('maybe_create_table') ) :
  * Create database table, if it doesn't already exist.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
+ *
  * @uses $wpdb
  *
  * @param string $table_name Database table name.
@@ -75,8 +74,7 @@ if ( ! function_exists('maybe_add_column') ) :
  * Add column to database table, if column doesn't already exist in table.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
+ *
  * @uses $wpdb
  *
  * @param string $table_name Database table name
@@ -108,8 +106,7 @@ endif;
  * Drop column from database table, if it exists.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
+ *
  * @uses $wpdb
  *
  * @param string $table_name Table name
@@ -152,8 +149,6 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
  *      Extra
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
  *
  * @param string $table_name Table name
  * @param string $col_name Column name
diff --git a/wp-admin/install.php b/wp-admin/install.php
index 921e62167c..ff14e7a531 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -47,8 +47,6 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
  * Display install header.
  *
  * @since 2.5.0
- * @package WordPress
- * @subpackage Installer
  */
 function display_header() {
 	header( 'Content-Type: text/html; charset=utf-8' );
@@ -73,8 +71,6 @@ function display_header() {
  * Display installer setup form.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Installer
  */
 function display_setup_form( $error = null ) {
 	global $wpdb;
diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php
index f24f420d83..99e17b2d7a 100644
--- a/wp-admin/link-parse-opml.php
+++ b/wp-admin/link-parse-opml.php
@@ -70,8 +70,6 @@ function startElement($parser, $tagName, $attrs) {
  *
  * @since 0.71
  * @access private
- * @package WordPress
- * @subpackage Dummy
  *
  * @param mixed $parser XML Parser resource.
  * @param string $tagName XML tag name.
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index ea229c61f0..ba116bba2e 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -19,8 +19,6 @@ if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_obj
 /**
  * Press It form handler.
  *
- * @package WordPress
- * @subpackage Press_This
  * @since 2.6.0
  *
  * @return int Post ID
@@ -163,8 +161,6 @@ if ( !empty($_REQUEST['ajax']) ) {
 		/**
 		 * Retrieve all image URLs from given URI.
 		 *
-		 * @package WordPress
-		 * @subpackage Press_This
 		 * @since 2.6.0
 		 *
 		 * @param string $uri
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 2bcdfd2a08..8efd0efaff 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -13,8 +13,6 @@
 
 /**
  * We are installing.
- *
- * @package WordPress
  */
 define('WP_INSTALLING', true);
 
@@ -88,8 +86,6 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
  *
  * @ignore
  * @since 2.3.0
- * @package WordPress
- * @subpackage Installer_WP_Config
  */
 function setup_config_display_header() {
 	global $wp_version;
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 149ad4c0e3..0de574e68b 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -766,9 +766,6 @@ class WP_Http {
 /**
  * HTTP request method uses PHP Streams to retrieve the url.
  *
- * @package WordPress
- * @subpackage HTTP
- *
  * @since 2.7.0
  * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client().
  */
@@ -1157,9 +1154,6 @@ class WP_Http_Streams {
  *
  * @see WP_HTTP::request
  *
- * @package WordPress
- * @subpackage HTTP
- *
  * @since 2.7.0
  * @deprecated 3.7.0 Please use WP_HTTP::request() directly
  */
diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php
index c8542efefa..c7de85ea2f 100644
--- a/wp-includes/class-wp-customize-setting.php
+++ b/wp-includes/class-wp-customize-setting.php
@@ -420,6 +420,8 @@ final class WP_Customize_Header_Image_Setting extends WP_Customize_Setting {
 }
 
 /**
+ * Class WP_Customize_Background_Image_Setting
+ *
  * @package WordPress
  * @subpackage Customize
  * @since 3.4.0
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 9287d39460..6aa76207ba 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -3,6 +3,7 @@
  * XML-RPC protocol support for WordPress
  *
  * @package WordPress
+ * @subpackage Publishing
  */
 
 /**
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 3f773af7af..60887ce81b 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1523,7 +1523,6 @@ function comment_form_title( $noreplytext = false, $replytext = false, $linktopa
 /**
  * HTML comment list class.
  *
- * @package WordPress
  * @uses Walker
  * @since 2.7.0
  */
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index b9ffed6da3..6386afcc43 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -466,8 +466,6 @@ class WP_Comment_Query {
  * Comments have a limited set of valid status values, this provides the comment
  * status values and descriptions.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.7.0
  *
  * @return array List of comment statuses.
@@ -2356,8 +2354,6 @@ function xmlrpc_pingback_error( $ixr_error ) {
  * Removes comment ID from the comment cache.
  *
  * @since 2.3.0
- * @package WordPress
- * @subpackage Cache
  *
  * @param int|array $ids Comment ID or array of comment IDs to remove from cache
  */
@@ -2376,8 +2372,6 @@ function clean_comment_cache($ids) {
  * cache using the comment group with the key using the ID of the comments.
  *
  * @since 2.3.0
- * @package WordPress
- * @subpackage Cache
  *
  * @param array $comments Array of comment row objects
  */
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 813d43364f..b2dea9a8c3 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -1677,8 +1677,6 @@ function the_author_ID() {
  * dots added to the end. If there is content left over, then dots will be added
  * and the rest of the content will be removed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @uses apply_filters() Calls 'the_content_rss' on the content before processing.
  *
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index ec54ac6043..c77abd529a 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -16,8 +16,6 @@
  * Everything will be stripped of tags and characters converted, when the values
  * are retrieved for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 1.5.1
  * @see get_bloginfo() For the list of possible values to display.
  *
@@ -47,8 +45,6 @@ function get_bloginfo_rss($show = '') {
  * Everything will be stripped of tags and characters converted, when the values
  * are retrieved for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @see get_bloginfo() For the list of possible values to display.
  *
@@ -74,8 +70,6 @@ function bloginfo_rss($show = '') {
  * The default feed is 'rss2', unless a plugin changes it through the
  * 'default_feed' filter.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  * @uses apply_filters() Calls 'default_feed' hook on the default feed string.
  *
@@ -97,8 +91,6 @@ function get_default_feed() {
 /**
  * Retrieve the blog title for the feed title.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.2.0
  *
  * @param string $sep Optional.How to separate the title. See wp_title() for more info.
@@ -123,8 +115,6 @@ function get_wp_title_rss($sep = '»') {
 /**
  * Display the blog title for display of the feed title.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.2.0
  * @see wp_title() $sep parameter usage.
  *
@@ -147,8 +137,6 @@ function wp_title_rss( $sep = '»' ) {
 /**
  * Retrieve the current post title for the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.0.0
  *
  * @return string Current post title.
@@ -169,8 +157,6 @@ function get_the_title_rss() {
 /**
  * Display the post title in the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @uses get_the_title_rss() Used to retrieve current post title.
  */
@@ -181,8 +167,6 @@ function the_title_rss() {
 /**
  * Retrieve the post content for feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.9.0
  * @see get_the_content()
  *
@@ -211,8 +195,6 @@ function get_the_content_feed($feed_type = null) {
 /**
  * Display the post content for feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.9.0
  * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
  * @see get_the_content()
@@ -226,8 +208,6 @@ function the_content_feed($feed_type = null) {
 /**
  * Display the post excerpt for the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  */
 function the_excerpt_rss() {
@@ -245,8 +225,6 @@ function the_excerpt_rss() {
 /**
  * Display the permalink to the post for use in feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.3.0
  */
 function the_permalink_rss() {
@@ -281,8 +259,6 @@ function comments_link_feed() {
 /**
  * Display the feed GUID for the current comment.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
@@ -294,8 +270,6 @@ function comment_guid($comment_id = null) {
 /**
  * Retrieve the feed GUID for the current comment.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
@@ -331,8 +305,6 @@ function comment_link() {
 /**
  * Retrieve the current comment author for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.0.0
  * @uses get_comment_author()
  *
@@ -354,8 +326,6 @@ function get_comment_author_rss() {
 /**
  * Display the current comment author in the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 1.0.0
  */
 function comment_author_rss() {
@@ -365,8 +335,6 @@ function comment_author_rss() {
 /**
  * Display the current comment content for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 1.0.0
  * @uses get_comment_text()
  */
@@ -390,8 +358,6 @@ function comment_text_rss() {
  * retrieved and have feed markup added, so that they can easily be added to the
  * RSS2, Atom, or RSS1 and RSS0.91 RDF feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.1.0
  *
  * @param string $type Optional, default is the type returned by get_default_feed().
@@ -444,8 +410,6 @@ function get_the_category_rss($type = null) {
 /**
  * Display the post categories in the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @see get_the_category_rss() For better explanation.
  *
@@ -460,8 +424,6 @@ function the_category_rss($type = null) {
  *
  * The two possible values are either 'xhtml' or 'html'.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.2.0
  */
 function html_type_rss() {
@@ -485,8 +447,6 @@ function html_type_rss() {
  * enclosure(s) consist of enclosure HTML tag(s) with a URI and other
  * attributes.
  *
- * @package WordPress
- * @subpackage Template
  * @since 1.5.0
  * @uses get_post_custom() To get the current post enclosure metadata.
  */
@@ -527,8 +487,6 @@ function rss_enclosure() {
  * metadata field and parses the value to display the enclosure(s). The
  * enclosure(s) consist of link HTML tag(s) with a URI and other attributes.
  *
- * @package WordPress
- * @subpackage Template
  * @since 2.2.0
  * @uses get_post_custom() To get the current post enclosure metadata.
  */
@@ -565,8 +523,6 @@ function atom_enclosure() {
  *
  * @link http://www.atomenabled.org/developers/syndication/atom-format-spec.php#rfc.section.3.1
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param string $data Input string
@@ -603,8 +559,6 @@ function prep_atom_text_construct($data) {
  *
  * Generate a correct link for the atom:self element.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  */
 function self_link() {
@@ -625,8 +579,6 @@ function self_link() {
 /**
  * Return the content type for specified feed type.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.8.0
  */
 function feed_content_type( $type = '' ) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 7acc75beaf..bf82736653 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -353,8 +353,6 @@ function maybe_serialize( $data ) {
  * If the title element is not part of the XML, then the default post title from
  * the $post_default_title will be used instead.
  *
- * @package WordPress
- * @subpackage XMLRPC
  * @since 0.71
  *
  * @global string $post_default_title Default XMLRPC post title.
@@ -379,8 +377,6 @@ function xmlrpc_getposttitle( $content ) {
  * used. The return type then would be what $post_default_category. If the
  * category is found, then it will always be an array.
  *
- * @package WordPress
- * @subpackage XMLRPC
  * @since 0.71
  *
  * @global string $post_default_category Default XMLRPC post category.
@@ -402,8 +398,6 @@ function xmlrpc_getpostcategory( $content ) {
 /**
  * XMLRPC XML content without title and category elements.
  *
- * @package WordPress
- * @subpackage XMLRPC
  * @since 0.71
  *
  * @param string $content XMLRPC XML Request content
@@ -443,7 +437,6 @@ function wp_extract_urls( $content ) {
  * remove enclosures that are no longer in the post. This is called as
  * pingbacks and trackbacks.
  *
- * @package WordPress
  * @since 1.5.0
  *
  * @uses $wpdb
@@ -1191,8 +1184,6 @@ function is_blog_installed() {
 /**
  * Retrieve URL with nonce added to URL query.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $actionurl URL to add nonce action.
@@ -1223,8 +1214,6 @@ function wp_nonce_url( $actionurl, $action = -1, $name = '_wpnonce' ) {
  * The input name will be whatever $name value you gave. The input value will be
  * the nonce creation value.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $action Optional. Action name.
@@ -1252,8 +1241,6 @@ function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $ec
  * The referer link is the current Request URI from the server super global. The
  * input name is '_wp_http_referer', in case you wanted to check manually.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param bool $echo Whether to echo or return the referer field.
@@ -1274,8 +1261,6 @@ function wp_referer_field( $echo = true ) {
  * value of {@link wp_referer_field()}, if that was posted already or it will
  * be the current page, if it doesn't exist.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param bool $echo Whether to echo the original http referer
@@ -1296,8 +1281,6 @@ function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
  * Retrieve referer from '_wp_http_referer' or HTTP referer. If it's the same
  * as the current request URL, will return false.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @return string|bool False on failure. Referer URL on success.
@@ -1319,8 +1302,6 @@ function wp_get_referer() {
 /**
  * Retrieve original referer that was posted, if it exists.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @return string|bool False if no original referer or original referer if set.
@@ -1831,7 +1812,6 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 /**
  * Retrieve the file type based on the extension name.
  *
- * @package WordPress
  * @since 2.5.0
  * @uses apply_filters() Calls 'ext2type' hook on default supported types.
  *
@@ -2092,8 +2072,6 @@ function get_allowed_mime_types( $user = null ) {
  * If the action has the nonce explain message, then it will be displayed along
  * with the "Are you sure?" message.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $action The nonce action.
@@ -2430,7 +2408,6 @@ function wp_send_json_error( $data = null ) {
  * development environment.
  *
  * @access private
- * @package WordPress
  * @since 2.2.0
  *
  * @param string $url URL for the home location
@@ -2450,7 +2427,6 @@ function _config_wp_home( $url = '' ) {
  * your localhost while not having to change the database to your URL.
  *
  * @access private
- * @package WordPress
  * @since 2.2.0
  *
  * @param string $url URL to set the WordPress site location.
@@ -2472,8 +2448,6 @@ function _config_wp_siteurl( $url = '' ) {
  * keys. These keys are then returned in the $input array.
  *
  * @access private
- * @package WordPress
- * @subpackage MCE
  * @since 2.1.0
  *
  * @param array $input MCE plugin array.
@@ -2904,8 +2878,6 @@ function url_is_accessable_via_ssl($url)
  *
  * This function is to be used in every function that is deprecated.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 2.5.0
  * @access private
  *
@@ -2949,8 +2921,6 @@ function _deprecated_function( $function, $version, $replacement = null ) {
  *
  * This function is to be used in every file that is deprecated.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 2.5.0
  * @access private
  *
@@ -3002,8 +2972,6 @@ function _deprecated_file( $file, $version, $replacement = null, $message = '' )
  *
  * The current behavior is to trigger a user error if WP_DEBUG is true.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 3.0.0
  * @access private
  *
@@ -3045,8 +3013,6 @@ function _deprecated_argument( $function, $version, $message = null ) {
  *
  * The current behavior is to trigger a user error if WP_DEBUG is true.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 3.1.0
  * @access private
  *
@@ -3390,7 +3356,6 @@ function is_main_network( $network_id = null ) {
  *
  *
  * @since 3.0.0
- * @package WordPress
  *
  * @return bool True if multisite and global terms enabled
  */
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 9920fb3f30..9ec4d26f56 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2190,7 +2190,6 @@ function wp_admin_css_uri( $file = 'wp-admin' ) {
  * $file is a file relative to wp-admin/ without its ".css" extension. A
  * stylesheet link to that generated URL is printed.
  *
- * @package WordPress
  * @since 2.3.0
  * @uses $wp_styles WordPress Styles Object
  *
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 5a811f49de..ce6a29fedb 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -499,8 +499,6 @@ function get_post_comments_feed_link($post_id = 0, $feed = '') {
  * anchor. If no link text is specified, default text is used. If no post ID is
  * specified, the current post is used.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param string $link_text Descriptive text.
@@ -522,8 +520,6 @@ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
  * Returns a link to the feed for all posts by a given author. A specific feed
  * can be requested or left blank to get the default feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int $author_id ID of an author.
@@ -560,8 +556,6 @@ function get_author_feed_link( $author_id, $feed = '' ) {
  * Returns a link to the feed for all posts in a given category. A specific feed
  * can be requested or left blank to get the default feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int $cat_id ID of a category.
@@ -1955,7 +1949,6 @@ function get_shortcut_link() {
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @uses get_home_url()
@@ -1975,7 +1968,6 @@ function home_url( $path = '', $scheme = null ) {
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param  int $blog_id   (optional) Blog ID. Defaults to current blog.
@@ -2016,7 +2008,6 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @uses get_site_url()
@@ -2036,7 +2027,6 @@ function site_url( $path = '', $scheme = null ) {
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param int $blog_id (optional) Blog ID. Defaults to current blog.
@@ -2064,7 +2054,6 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
 /**
  * Retrieve the url to the admin area for the current site.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional path relative to the admin url.
@@ -2078,7 +2067,6 @@ function admin_url( $path = '', $scheme = 'admin' ) {
 /**
  * Retrieve the url to the admin area for a given site.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param int $blog_id (optional) Blog ID. Defaults to current blog.
@@ -2098,7 +2086,6 @@ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 /**
  * Retrieve the url to the includes directory.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional. Path relative to the includes url.
@@ -2117,7 +2104,6 @@ function includes_url( $path = '', $scheme = null ) {
 /**
  * Retrieve the url to the content directory.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional. Path relative to the content url.
@@ -2136,7 +2122,6 @@ function content_url($path = '') {
  * Retrieve the url to the plugins directory or to a specific file within that directory.
  * You can hardcode the plugin slug in $path or pass __FILE__ as a second argument to get the correct folder name.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional. Path relative to the plugins url.
@@ -2178,7 +2163,6 @@ function plugins_url($path = '', $plugin = '') {
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param string $path Optional. Path relative to the site url.
@@ -2209,7 +2193,6 @@ function network_site_url( $path = '', $scheme = null ) {
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param  string $path   (optional) Path relative to the home url.
@@ -2240,7 +2223,6 @@ function network_home_url( $path = '', $scheme = null ) {
 /**
  * Retrieve the url to the admin area for the network.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param string $path Optional path relative to the admin url.
@@ -2262,7 +2244,6 @@ function network_admin_url( $path = '', $scheme = 'admin' ) {
 /**
  * Retrieve the url to the admin area for the current user.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param string $path Optional path relative to the admin url.
@@ -2281,7 +2262,6 @@ function user_admin_url( $path = '', $scheme = 'admin' ) {
 /**
  * Retrieve the url to the admin area for either the current blog or the network depending on context.
  *
- * @package WordPress
  * @since 3.1.0
  *
  * @param string $path Optional path relative to the admin url.
@@ -2398,7 +2378,6 @@ function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 /**
  * Output rel=canonical for singular queries.
  *
- * @package WordPress
  * @since 2.9.0
 */
 function rel_canonical() {
diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 7b559d30da..e69e1f5b3d 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -10,7 +10,6 @@
 /**
  * Create HTML list of nav menu items.
  *
- * @package WordPress
  * @since 3.0.0
  * @uses Walker
  */
diff --git a/wp-includes/option.php b/wp-includes/option.php
index ec30231d5e..09c74f52fc 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -3,6 +3,7 @@
  * Option API
  *
  * @package WordPress
+ * @subpackage Option
  */
 
 /**
@@ -16,8 +17,6 @@
  * If the option was serialized then it will be unserialized when it is returned.
  *
  * @since 1.5.0
- * @package WordPress
- * @subpackage Option
  * @uses apply_filters() Calls 'pre_option_$option' before checking the option.
  * 	Any value other than false will "short-circuit" the retrieval of the option
  *	and return the returned value. You should not try to override special options,
@@ -98,8 +97,6 @@ function get_option( $option, $default = false ) {
  * and 'notoptions' options.
  *
  * @since 2.2.0
- * @package WordPress
- * @subpackage Option
  *
  * @param string $option Option name.
  */
@@ -113,8 +110,6 @@ function wp_protect_special_option( $option ) {
  *
  * @uses attr Sanitizes value.
  * @since 1.5.0
- * @package WordPress
- * @subpackage Option
  *
  * @param string $option Option name.
  */
@@ -126,8 +121,6 @@ function form_option( $option ) {
  * Loads and caches all autoloaded options, if available or all options.
  *
  * @since 2.2.0
- * @package WordPress
- * @subpackage Option
  *
  * @return array List of all options.
  */
@@ -159,8 +152,6 @@ function wp_load_alloptions() {
  * Loads and caches certain often requested site options if is_multisite() and a persistent cache is not being used.
  *
  * @since 3.0.0
- * @package WordPress
- * @subpackage Option
  *
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
@@ -199,8 +190,6 @@ function wp_load_core_site_options( $site_id = null ) {
  * to set whether an option is autoloaded, then you need to use the add_option().
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Option
  *
  * @uses apply_filters() Calls 'pre_update_option_$option' hook to allow overwriting the
  * 	option value to be stored.
@@ -274,8 +263,6 @@ function update_option( $option, $value ) {
  * aren't adding a protected WordPress option. Care should be taken to not name
  * options the same as the ones which are protected.
  *
- * @package WordPress
- * @subpackage Option
  * @since 1.0.0
  *
  * @uses do_action() Calls 'add_option' hook before adding the option.
@@ -343,8 +330,6 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 /**
  * Removes option by name. Prevents removal of protected WordPress options.
  *
- * @package WordPress
- * @subpackage Option
  * @since 1.2.0
  *
  * @uses do_action() Calls 'delete_option' hook before option is deleted.
@@ -391,8 +376,6 @@ function delete_option( $option ) {
  * Delete a transient.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses do_action() Calls 'delete_transient_$transient' hook before transient is deleted.
  * @uses do_action() Calls 'deleted_transient' hook on success.
@@ -431,8 +414,6 @@ function delete_transient( $transient ) {
  * 	the transient value.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Transient
  *
  * @param string $transient Transient name. Expected to not be SQL-escaped
  * @return mixed Value of transient
@@ -473,8 +454,6 @@ function get_transient( $transient ) {
  * it will be serialized before it is set.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses apply_filters() Calls 'pre_set_transient_$transient' hook to allow overwriting the
  * 	transient value to be stored.
@@ -521,8 +500,6 @@ function set_transient( $transient, $value, $expiration = 0 ) {
  * cookie exists (different browser used), adds the last saved cookie restoring
  * the settings.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  */
 function wp_user_settings() {
@@ -568,8 +545,6 @@ function wp_user_settings() {
 /**
  * Retrieve user interface setting value based on setting name.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  *
  * @param string $name The name of the setting.
@@ -588,8 +563,6 @@ function get_user_setting( $name, $default = false ) {
  * Both $name and $value can contain only ASCII letters, numbers and underscores.
  * This function has to be used before any output has started as it calls setcookie().
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @param string $name The name of the setting.
@@ -613,8 +586,6 @@ function set_user_setting( $name, $value ) {
  * Deleting settings would reset them to the defaults.
  * This function has to be used before any output has started as it calls setcookie().
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  *
  * @param mixed $names The name or array of names of the setting to be deleted.
@@ -645,8 +616,6 @@ function delete_user_setting( $names ) {
 /**
  * Retrieve all user interface settings.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  *
  * @return array the last saved user settings or empty array.
@@ -680,8 +649,6 @@ function get_all_user_settings() {
 /**
  * Private. Set all user interface settings.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @param array $user_settings
@@ -717,8 +684,6 @@ function wp_set_all_user_settings( $user_settings ) {
 /**
  * Delete the user settings of the current user.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  */
 function delete_all_user_settings() {
@@ -733,8 +698,6 @@ function delete_all_user_settings() {
  * Retrieve site option value based on name of option.
  *
  * @see get_option()
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @uses apply_filters() Calls 'pre_site_option_$option' before checking the option.
@@ -795,8 +758,6 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
  * Existing options will not be updated. Note that prior to 3.3 this wasn't the case.
  *
  * @see add_option()
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @uses apply_filters() Calls 'pre_add_site_option_$option' hook to allow overwriting the
@@ -856,8 +817,6 @@ function add_site_option( $option, $value ) {
  * Removes site option by name.
  *
  * @see delete_option()
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @uses do_action() Calls 'pre_delete_site_option_$option' hook before option is deleted.
@@ -899,8 +858,6 @@ function delete_site_option( $option ) {
  *
  * @see update_option()
  * @since 2.8.0
- * @package WordPress
- * @subpackage Option
  *
  * @uses apply_filters() Calls 'pre_update_site_option_$option' hook to allow overwriting the
  * 	option value to be stored.
@@ -957,8 +914,6 @@ function update_site_option( $option, $value ) {
  * Delete a site transient.
  *
  * @since 2.9.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses do_action() Calls 'delete_site_transient_$transient' hook before transient is deleted.
  * @uses do_action() Calls 'deleted_site_transient' hook on success.
@@ -990,8 +945,6 @@ function delete_site_transient( $transient ) {
  *
  * @see get_transient()
  * @since 2.9.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses apply_filters() Calls 'pre_site_transient_$transient' hook before checking the transient.
  * 	Any value other than false will "short-circuit" the retrieval of the transient
@@ -1038,8 +991,6 @@ function get_site_transient( $transient ) {
  *
  * @see set_transient()
  * @since 2.9.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses apply_filters() Calls 'pre_set_site_transient_$transient' hook to allow overwriting the
  * 	transient value to be stored.
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 7a66ec04b5..6607440424 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -63,9 +63,6 @@ if ( ! isset( $wp_current_filter ) )
  * is valid. It is up to you to take care. This is done for optimization purposes,
  * so everything is as quick as possible.
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @global array $wp_filter      A multidimensional array of all hooks and the callbacks hooked to them.
  * @global array $merged_filters Tracks the tags that need to be merged for later. If the hook is added, it doesn't need to run through that process.
  *
@@ -91,8 +88,6 @@ function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1
 /**
  * Check if any filter has been registered for a hook.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5.0
  *
  * @global array $wp_filter Stores all of the filters
@@ -147,9 +142,6 @@ function has_filter($tag, $function_to_check = false) {
  * $value = apply_filters( 'example_filter', 'filter me', $arg1, $arg2 );
  * </code>
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @global array $wp_filter         Stores all of the filters
  * @global array $merged_filters    Merges the filter hooks using this function.
  * @global array $wp_current_filter stores the list of current filters with the current one last
@@ -213,8 +205,6 @@ function apply_filters( $tag, $value ) {
  * @see apply_filters() This function is identical, but the arguments passed to the
  * functions hooked to <tt>$tag</tt> are supplied using an array.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 3.0.0
  * @global array $wp_filter Stores all of the filters
  * @global array $merged_filters Merges the filter hooks using this function.
@@ -274,9 +264,6 @@ function apply_filters_ref_array($tag, $args) {
  * when the hook was added. This goes for both filters and actions. No warning
  * will be given on removal failure.
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @since 1.2.0
  *
  * @param string $tag The filter hook to which the function to be removed is hooked.
@@ -328,8 +315,6 @@ function remove_all_filters($tag, $priority = false) {
 /**
  * Retrieve the name of the current filter or action.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5.0
  *
  * @return string Hook name of the current filter or action.
@@ -349,9 +334,6 @@ function current_filter() {
  *
  * @uses add_filter() Adds an action. Parameter list and functionality are the same.
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @since 1.2.0
  *
  * @param string $tag The name of the action to which the $function_to_add is hooked.
@@ -376,9 +358,6 @@ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1)
  * @see apply_filters() This function works similar with the exception that
  * nothing is returned and only the functions or methods are called.
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @since 1.2.0
  *
  * @global array $wp_filter Stores all of the filters
@@ -441,8 +420,6 @@ function do_action($tag, $arg = '') {
 /**
  * Retrieve the number of times an action is fired.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.1.0
  *
  * @global array $wp_actions Increments the amount of times action was triggered.
@@ -465,8 +442,6 @@ function did_action($tag) {
  * @see do_action() This function is identical, but the arguments passed to the
  * functions hooked to <tt>$tag</tt> are supplied using an array.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.1.0
  *
  * @global array $wp_filter Stores all of the filters
@@ -521,8 +496,6 @@ function do_action_ref_array($tag, $args) {
 /**
  * Check if any action has been registered for a hook.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5.0
  *
  * @see has_filter() has_action() is an alias of has_filter().
@@ -545,9 +518,6 @@ function has_action($tag, $function_to_check = false) {
  * method can be used to remove default functions attached to a specific filter
  * hook and possibly replace them with a substitute.
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @since 1.2.0
  *
  * @param string $tag The action hook to which the function to be removed is hooked.
@@ -581,9 +551,6 @@ function remove_all_actions($tag, $priority = false) {
  *
  * This method extracts the name of a plugin from its filename.
  *
- * @package WordPress
- * @subpackage Plugin
- *
  * @since 1.5.0
  *
  * @access private
@@ -630,8 +597,7 @@ function wp_register_plugin_realpath( $file ) {
 
 /**
  * Gets the filesystem directory path (with trailing slash) for the plugin __FILE__ passed in
- * @package WordPress
- * @subpackage Plugin
+ *
  * @since 2.8.0
  *
  * @param string $file The filename of the plugin (__FILE__)
@@ -643,8 +609,7 @@ function plugin_dir_path( $file ) {
 
 /**
  * Gets the URL directory path (with trailing slash) for the plugin __FILE__ passed in
- * @package WordPress
- * @subpackage Plugin
+ *
  * @since 2.8.0
  *
  * @param string $file The filename of the plugin (__FILE__)
@@ -667,8 +632,6 @@ function plugin_dir_url( $file ) {
  * wp-content/plugins/sample.php the name of this hook will be
  * 'activate_sample.php'.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.0.0
  *
  * @param string $file The filename of the plugin including the path.
@@ -692,8 +655,6 @@ function register_activation_hook($file, $function) {
  * wp-content/plugins/sample.php the name of this hook will be
  * 'deactivate_sample.php'.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.0.0
  *
  * @param string $file The filename of the plugin including the path.
@@ -754,8 +715,6 @@ function register_uninstall_hook( $file, $callback ) {
  * functions. This function does not check for the existence of the all hook, so
  * it will fail unless the all hook exists prior to this function call.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5.0
  * @access private
  *
@@ -792,8 +751,6 @@ function _wp_call_all_hook($args) {
  * Functions and static method callbacks are just returned as strings and
  * shouldn't have any speed penalty.
  *
- * @package WordPress
- * @subpackage Plugin
  * @access private
  * @since 2.2.3
  * @link http://trac.wordpress.org/ticket/3875
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index caa0700f49..64aee53a79 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -593,12 +593,9 @@ function post_password_required( $post = null ) {
 	return ! $hasher->CheckPassword( $post->post_password, $hash );
 }
 
-/**
- * Page Template Functions for usage in Themes
- *
- * @package WordPress
- * @subpackage Template
- */
+//
+// Page Template Functions for usage in Themes
+//
 
 /**
  * The formatted output of a list of pages.
@@ -986,7 +983,6 @@ function walk_page_dropdown_tree() {
 /**
  * Create HTML list of pages.
  *
- * @package WordPress
  * @since 2.1.0
  * @uses Walker
  */
@@ -1102,7 +1098,6 @@ class Walker_Page extends Walker {
 /**
  * Create HTML dropdown list of pages.
  *
- * @package WordPress
  * @since 2.1.0
  * @uses Walker
  */
@@ -1306,8 +1301,6 @@ function get_page_template_slug( $post_id = null ) {
 /**
  * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses date_i18n()
@@ -1345,8 +1338,6 @@ function wp_post_revision_title( $revision, $link = true ) {
 /**
  * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 3.6.0
  *
  * @uses date_i18n()
@@ -1398,8 +1389,6 @@ function wp_post_revision_title_expanded( $revision, $link = true ) {
  * Can output either a UL with edit links or a TABLE with diff interface, and
  * restore action links.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses wp_get_post_revisions()
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 5ef96b33a9..50b9c4481d 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -876,8 +876,6 @@ function get_page_statuses() {
  *
  * Arguments prefixed with an _underscore shouldn't be used by plugins and themes.
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_statuses Inserts new post status object into the list
  *
@@ -951,8 +949,6 @@ function register_post_status($post_status, $args = array()) {
 /**
  * Retrieve a post status object by name
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_statuses
  * @see register_post_status
@@ -973,8 +969,6 @@ function get_post_status_object( $post_status ) {
 /**
  * Get a list of all registered post status objects.
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_statuses
  * @see register_post_status
@@ -1044,8 +1038,6 @@ function get_post_type( $post = null ) {
 /**
  * Retrieve a post type object by name
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_types
  * @see register_post_type
@@ -1066,8 +1058,6 @@ function get_post_type_object( $post_type ) {
 /**
  * Get a list of all registered post type objects.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.9.0
  * @uses $wp_post_types
  * @see register_post_type
@@ -2601,8 +2591,6 @@ function wp_get_post_categories( $post_id = 0, $args = array() ) {
  * is set to 'all'. There are other defaults that can be overridden in
  * {@link wp_get_object_terms()}.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.3.0
  *
  * @uses wp_get_object_terms() Gets the tags for returning. Args can be found here
@@ -2622,8 +2610,6 @@ function wp_get_post_tags( $post_id = 0, $args = array() ) {
  * is set to 'all'. There are other defaults that can be overridden in
  * {@link wp_get_object_terms()}.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.8.0
  *
  * @uses wp_get_object_terms() Gets the tags for returning. Args can be found here
@@ -3215,8 +3201,6 @@ function _truncate_post_slug( $slug, $length = 200 ) {
  *
  * @uses wp_set_post_tags() Same first two parameters, but the last parameter is always set to true.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.3.0
  *
  * @param int $post_id Post ID
@@ -4716,8 +4700,6 @@ function _get_last_post_time( $timezone, $field ) {
 /**
  * Updates posts in cache.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 1.5.1
  *
  * @param array $posts Array of post objects
@@ -4739,8 +4721,6 @@ function update_post_cache( &$posts ) {
  * This function not run if $_wp_suspend_cache_invalidation is not empty. See
  * wp_suspend_cache_invalidation().
  *
- * @package WordPress
- * @subpackage Cache
  * @since 2.0.0
  *
  * @uses do_action() Calls 'clean_post_cache' on $id before adding children (if any).
@@ -4780,8 +4760,6 @@ function clean_post_cache( $post ) {
 /**
  * Call major cache updating functions for list of Post objects.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 1.5.0
  *
  * @uses update_post_cache()
@@ -4834,8 +4812,6 @@ function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = t
  * metadata cache for the posts. Therefore, the functions, which call this
  * function, do not need to perform SQL queries on their own.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 2.1.0
  *
  * @param array $post_ids List of post IDs.
@@ -4854,8 +4830,6 @@ function update_postmeta_cache($post_ids) {
  * This function will not run if $_wp_suspend_cache_invalidation is not empty. See
  * wp_suspend_cache_invalidation().
  *
- * @package WordPress
- * @subpackage Cache
  * @since 3.0.0
  *
  * @uses do_action() Calls 'clean_attachment_cache' on $id.
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 234063d969..9fbfcaffc6 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -123,8 +123,6 @@ add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
 /**
  * Get a list of registered taxonomy objects.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  * @uses $wp_taxonomies
  * @see register_taxonomy
@@ -152,8 +150,6 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' )
  * <code><?php $taxonomies = get_object_taxonomies('post'); ?></code> Should
  * result in <code>Array('category', 'post_tag')</code>
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wp_taxonomies
@@ -192,8 +188,6 @@ function get_object_taxonomies($object, $output = 'names') {
  * The get_taxonomy function will first check that the parameter string given
  * is a taxonomy object and if it is, it will return it.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wp_taxonomies
@@ -216,8 +210,6 @@ function get_taxonomy( $taxonomy ) {
  *
  * Formerly is_taxonomy(), introduced in 2.3.0.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  *
  * @uses $wp_taxonomies
@@ -239,8 +231,6 @@ function taxonomy_exists( $taxonomy ) {
  *
  * A false return value might also mean that the taxonomy does not exist.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses taxonomy_exists() Checks whether taxonomy exists
@@ -488,8 +478,6 @@ function get_taxonomy_labels( $tax ) {
 /**
  * Add an already registered taxonomy to an object type.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  * @uses $wp_taxonomies Modifies taxonomy object
  *
@@ -557,8 +545,6 @@ function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
  * using PHP sort family functions or using the database by using $args with
  * either ASC or DESC array. The value should be in the key named 'order'.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -918,8 +904,6 @@ class WP_Tax_Query {
  * example, if 'category', it would be 'get_category' as the filter name. Useful
  * for custom taxonomies or plugging into default taxonomies.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -991,8 +975,6 @@ function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
  * If $value does not exist, the return value will be false. If $taxonomy exists
  * and $field and $value combinations exist, the Term will be returned.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1060,8 +1042,6 @@ function get_term_by($field, $value, $taxonomy, $output = OBJECT, $filter = 'raw
  *
  * Will return an empty array if $term does not exist in $taxonomy.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1100,8 +1080,6 @@ function get_term_children( $term_id, $taxonomy ) {
  * reasons and for simplicity of usage. See sanitize_term_field() for more
  * information.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses sanitize_term_field() Passes the return value in sanitize_term_field on success.
@@ -1133,8 +1111,6 @@ function get_term_field( $field, $term, $taxonomy, $context = 'display' ) {
  * Return value is sanitize_term() and usage is for sanitizing the term for
  * editing. Function is for contextual and simplicity.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses sanitize_term() Passes the return value on success
@@ -1244,8 +1220,6 @@ function get_term_to_edit( $id, $taxonomy ) {
  * query (such as 'terms_clauses'), setting 'cache_domain' to a unique value will not overwrite
  * the cache for similar queries. Default value is 'core'.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1551,8 +1525,6 @@ function get_terms($taxonomies, $args = '') {
  *
  * Formerly is_term(), introduced in 2.3.0.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  *
  * @uses $wpdb
@@ -1647,8 +1619,6 @@ function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
  *
  * The $term is expected to be either an array or an object.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses sanitize_term_field Used to sanitize all fields in a term
@@ -1697,8 +1667,6 @@ function sanitize_term($term, $taxonomy, $context = 'display') {
  * without creating your own filter function. Simply create a function that
  * hooks into the filter you need.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1757,8 +1725,6 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
  *
  * Default $args is 'hide_empty' which can be 'hide_empty=true' or array('hide_empty' => true).
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses get_terms()
@@ -1790,8 +1756,6 @@ function wp_count_terms( $taxonomy, $args = array() ) {
  * a particular taxonomy or taxonomies. Does not remove the term or
  * taxonomy itself.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses wp_remove_object_terms()
  *
@@ -1822,8 +1786,7 @@ function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
  *
  * The $args 'force_default' will force the term supplied as default to be
  * assigned even if the object was not going to be termless
- * @package WordPress
- * @subpackage Taxonomy
+ *
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1953,8 +1916,6 @@ function wp_delete_category( $cat_ID ) {
  * terms objects will be returned. If either 'ids' or 'names' is used, then an
  * array of all matching term ids or term names will be returned respectively.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2241,8 +2202,6 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
  * A term has no meaning until it is given context by defining which taxonomy it
  * exists under.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses wp_remove_object_terms()
  *
@@ -2337,8 +2296,6 @@ function wp_set_object_terms($object_id, $terms, $taxonomy, $append = false) {
 /**
  * Add term(s) associated with a given object.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.6.0
  * @uses wp_set_object_terms()
  *
@@ -2354,8 +2311,6 @@ function wp_add_object_terms( $object_id, $terms, $taxonomy ) {
 /**
  * Remove term(s) associated with a given object.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.6.0
  * @uses $wpdb
  *
@@ -2429,8 +2384,6 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
  *
  * The only purpose for $term is for appending a parent, if one exists.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2502,8 +2455,6 @@ function wp_unique_term_slug($slug, $term) {
  * For what can be overrode in $args, check the term scheme can contain and stay
  * away from the term keys.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -2643,8 +2594,6 @@ function wp_defer_term_counting($defer=null) {
  * The default action is to count what the amount of terms have the relationship
  * of term ID. Once that is done, then update the database.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2727,8 +2676,6 @@ function wp_update_term_count_now( $terms, $taxonomy ) {
  * term IDs have to exist within the taxonomy $object_type for the deletion to
  * take place.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @see get_object_taxonomies() for more on $object_type
@@ -2756,8 +2703,6 @@ function clean_object_term_cache($object_ids, $object_type) {
 /**
  * Will remove all of the term ids from the cache.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2811,8 +2756,6 @@ function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
 /**
  * Retrieves the taxonomy relationship to the term object id.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses wp_cache_get() Retrieves taxonomy relationship from cache
@@ -2839,8 +2782,6 @@ function get_object_term_cache($id, $taxonomy) {
  * lot of terms that exist in a lot of taxonomies. The amount of time increases
  * for each term and it also increases for each taxonomy the term belongs to.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses wp_get_object_terms() Used to get terms from the database to update
  *
@@ -2898,8 +2839,6 @@ function update_object_term_cache($object_ids, $object_type) {
 /**
  * Updates Terms to Taxonomy in cache.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @param array $terms List of Term objects to change
@@ -2922,8 +2861,6 @@ function update_term_cache($terms, $taxonomy = '') {
 /**
  * Retrieves children of taxonomy as Term IDs.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  *
@@ -2957,8 +2894,6 @@ function _get_term_hierarchy($taxonomy) {
  * If $terms is an array of objects, then _get_term_children returns an array of objects.
  * If $terms is an array of IDs, then _get_term_children returns an array of IDs.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  *
@@ -3028,8 +2963,6 @@ function _get_term_children($term_id, $terms, $taxonomy) {
  * Recalculates term counts by including items from child terms. Assumes all
  * relevant children are already in the $terms argument.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  * @uses $wpdb
@@ -3094,8 +3027,6 @@ function _pad_term_counts(&$terms, $taxonomy) {
  * Private function for the default callback for post_tag and category
  * taxonomies.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  * @uses $wpdb
@@ -3142,8 +3073,6 @@ function _update_post_term_count( $terms, $taxonomy ) {
  *
  * Default callback for the link_category taxonomy.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.3.0
  * @uses $wpdb
  *
diff --git a/wp-includes/update.php b/wp-includes/update.php
index c670f9d0b7..2e038a9f8a 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -13,7 +13,6 @@
  * WordPress server at api.wordpress.org server. Will only check if WordPress
  * isn't installing.
  *
- * @package WordPress
  * @since 2.3.0
  * @uses $wp_version Used to check against the newest WordPress version.
  *
@@ -164,7 +163,6 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
  * all plugins installed. Checks against the WordPress server at
  * api.wordpress.org. Will only check if WordPress isn't installing.
  *
- * @package WordPress
  * @since 2.3.0
  * @uses $wp_version Used to notify the WordPress version.
  *
@@ -295,7 +293,6 @@ function wp_update_plugins() {
  * WordPress server at api.wordpress.org. Will only check if WordPress isn't
  * installing.
  *
- * @package WordPress
  * @since 2.7.0
  * @uses $wp_version Used to notify the WordPress version.
  *