diff --git a/i18n/continents.php b/i18n/continents.php
index da519983b17..13f743c9c68 100644
--- a/i18n/continents.php
+++ b/i18n/continents.php
@@ -4,7 +4,7 @@
  *
  * Returns an array of continents.
  *
- * @package WooCommerce/i18n
+ * @package WooCommerce\i18n
  * @version 2.5.0
  */
 
diff --git a/i18n/locale-info.php b/i18n/locale-info.php
index d2c928eece6..458b17f95d8 100644
--- a/i18n/locale-info.php
+++ b/i18n/locale-info.php
@@ -2,7 +2,7 @@
 /**
  * Locales information
  *
- * @package WooCommerce/i18n
+ * @package WooCommerce\i18n
  * @version 3.5.0
  */
 
diff --git a/i18n/phone.php b/i18n/phone.php
index 3f118c971ea..4856e7421b7 100644
--- a/i18n/phone.php
+++ b/i18n/phone.php
@@ -4,7 +4,7 @@
  *
  * Returns an array of calling codes.
  *
- * @package WooCommerce/i18n
+ * @package WooCommerce\i18n
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/abstracts/abstract-wc-data.php b/includes/abstracts/abstract-wc-data.php
index ea54e7085df..383d6d19547 100644
--- a/includes/abstracts/abstract-wc-data.php
+++ b/includes/abstracts/abstract-wc-data.php
@@ -7,7 +7,7 @@
  *
  * @class       WC_Data
  * @version     3.0.0
- * @package     WooCommerce/Classes
+ * @package     WooCommerce\Classes
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -20,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Implemented by classes using the same CRUD(s) pattern.
  *
  * @version  2.6.0
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 abstract class WC_Data {
 
diff --git a/includes/abstracts/abstract-wc-integration.php b/includes/abstracts/abstract-wc-integration.php
index 8ad46759b09..98dd28486f5 100644
--- a/includes/abstracts/abstract-wc-integration.php
+++ b/includes/abstracts/abstract-wc-integration.php
@@ -7,7 +7,7 @@
  *
  * @class       WC_Settings_API
  * @version     2.6.0
- * @package     WooCommerce/Abstracts
+ * @package     WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -22,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class    WC_Integration
  * @extends  WC_Settings_API
  * @version  2.6.0
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 abstract class WC_Integration extends WC_Settings_API {
 
diff --git a/includes/abstracts/abstract-wc-log-handler.php b/includes/abstracts/abstract-wc-log-handler.php
index 64d6e0a6c50..4cf148d172e 100644
--- a/includes/abstracts/abstract-wc-log-handler.php
+++ b/includes/abstracts/abstract-wc-log-handler.php
@@ -3,7 +3,7 @@
  * Log handling functionality.
  *
  * @class WC_Log_Handler
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Abstract WC Log Handler Class
  *
  * @version        1.0.0
- * @package        WooCommerce/Abstracts
+ * @package        WooCommerce\Abstracts
  */
 abstract class WC_Log_Handler implements WC_Log_Handler_Interface {
 
diff --git a/includes/abstracts/abstract-wc-object-query.php b/includes/abstracts/abstract-wc-object-query.php
index 7e232462a6a..0d1542056cd 100644
--- a/includes/abstracts/abstract-wc-object-query.php
+++ b/includes/abstracts/abstract-wc-object-query.php
@@ -2,7 +2,7 @@
 /**
  * Query abstraction layer functionality.
  *
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Extended by classes to provide a query abstraction layer for safe object searching.
  *
  * @version  3.1.0
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 abstract class WC_Object_Query {
 
diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index 5efd4b0c9e6..3cca0abefb2 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -7,7 +7,7 @@
  *
  * @class       WC_Abstract_Order
  * @version     3.0.0
- * @package     WooCommerce/Classes
+ * @package     WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/abstracts/abstract-wc-payment-gateway.php b/includes/abstracts/abstract-wc-payment-gateway.php
index 180c3f05adf..dcfb7614ff8 100644
--- a/includes/abstracts/abstract-wc-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-payment-gateway.php
@@ -6,7 +6,7 @@
  *
  * @class WC_Payment_Gateway
  * @version 2.1.0
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 
 use Automattic\Jetpack\Constants;
@@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class       WC_Payment_Gateway
  * @extends     WC_Settings_API
  * @version     2.1.0
- * @package     WooCommerce/Abstracts
+ * @package     WooCommerce\Abstracts
  */
 abstract class WC_Payment_Gateway extends WC_Settings_API {
 
diff --git a/includes/abstracts/abstract-wc-payment-token.php b/includes/abstracts/abstract-wc-payment-token.php
index 60635bad6d7..ad958991981 100644
--- a/includes/abstracts/abstract-wc-payment-token.php
+++ b/includes/abstracts/abstract-wc-payment-token.php
@@ -5,7 +5,7 @@
  * Generic payment tokens functionality which can be extended by idividual types of payment tokens.
  *
  * @class WC_Payment_Token
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -23,7 +23,7 @@ require_once WC_ABSPATH . 'includes/legacy/abstract-wc-legacy-payment-token.php'
  * @class       WC_Payment_Token
  * @version     3.0.0
  * @since       2.6.0
- * @package     WooCommerce/Abstracts
+ * @package     WooCommerce\Abstracts
  */
 abstract class WC_Payment_Token extends WC_Legacy_Payment_Token {
 
diff --git a/includes/abstracts/abstract-wc-privacy.php b/includes/abstracts/abstract-wc-privacy.php
index 5908915e6de..1f181481ee8 100644
--- a/includes/abstracts/abstract-wc-privacy.php
+++ b/includes/abstracts/abstract-wc-privacy.php
@@ -3,7 +3,7 @@
  * WooCommerce abstract privacy class.
  *
  * @since 3.4.0
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit;
  * privacy data to be exported and privacy data to be deleted.
  *
  * @version  3.4.0
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 abstract class WC_Abstract_Privacy {
 	/**
diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php
index 6109689ab33..f45d1449ebb 100644
--- a/includes/abstracts/abstract-wc-product.php
+++ b/includes/abstracts/abstract-wc-product.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce product base class.
  *
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,7 +21,7 @@ require_once WC_ABSPATH . 'includes/legacy/abstract-wc-legacy-product.php';
  * The WooCommerce product class handles individual product data.
  *
  * @version 3.0.0
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 class WC_Product extends WC_Abstract_Legacy_Product {
 
diff --git a/includes/abstracts/abstract-wc-session.php b/includes/abstracts/abstract-wc-session.php
index fb4fc5b0e03..bec2ac223ba 100644
--- a/includes/abstracts/abstract-wc-session.php
+++ b/includes/abstracts/abstract-wc-session.php
@@ -4,7 +4,7 @@
  *
  * @class       WC_Session
  * @version     2.0.0
- * @package     WooCommerce/Abstracts
+ * @package     WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/abstracts/abstract-wc-settings-api.php b/includes/abstracts/abstract-wc-settings-api.php
index 4fd19ca7041..f33a62365fc 100644
--- a/includes/abstracts/abstract-wc-settings-api.php
+++ b/includes/abstracts/abstract-wc-settings-api.php
@@ -4,7 +4,7 @@
  *
  * Admin Settings API used by Integrations, Shipping Methods, and Payment Gateways.
  *
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/abstracts/abstract-wc-shipping-method.php b/includes/abstracts/abstract-wc-shipping-method.php
index c5922a75627..c27b0ae961a 100644
--- a/includes/abstracts/abstract-wc-shipping-method.php
+++ b/includes/abstracts/abstract-wc-shipping-method.php
@@ -3,7 +3,7 @@
  * Abstract shipping method
  *
  * @class WC_Shipping_Method
- * @package WooCommerce/Abstracts
+ * @package WooCommerce\Abstracts
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class       WC_Shipping_Method
  * @version     3.0.0
- * @package     WooCommerce/Abstracts
+ * @package     WooCommerce\Abstracts
  */
 abstract class WC_Shipping_Method extends WC_Settings_API {
 
diff --git a/includes/abstracts/abstract-wc-widget.php b/includes/abstracts/abstract-wc-widget.php
index c2f6f1bf298..10ac9e4cec6 100644
--- a/includes/abstracts/abstract-wc-widget.php
+++ b/includes/abstracts/abstract-wc-widget.php
@@ -3,7 +3,7 @@
  * Abstract widget class
  *
  * @class WC_Widget
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  */
 
 use Automattic\Jetpack\Constants;
@@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * WC_Widget
  *
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  * @version  2.5.0
  * @extends  WP_Widget
  */
diff --git a/includes/abstracts/class-wc-background-process.php b/includes/abstracts/class-wc-background-process.php
index 6d9662208fc..a48fa589240 100644
--- a/includes/abstracts/class-wc-background-process.php
+++ b/includes/abstracts/class-wc-background-process.php
@@ -5,7 +5,7 @@
  * Uses https://github.com/A5hleyRich/wp-background-processing to handle DB
  * updates in the background.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php
index 42faab0fb19..6d24bf71db4 100644
--- a/includes/admin/class-wc-admin-addons.php
+++ b/includes/admin/class-wc-admin-addons.php
@@ -2,7 +2,7 @@
 /**
  * Addons Page
  *
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  2.5.0
  */
 
diff --git a/includes/admin/class-wc-admin-assets.php b/includes/admin/class-wc-admin-assets.php
index a7760148a84..567e2efe7ca 100644
--- a/includes/admin/class-wc-admin-assets.php
+++ b/includes/admin/class-wc-admin-assets.php
@@ -2,7 +2,7 @@
 /**
  * Load assets
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  * @version 3.7.0
  */
 
diff --git a/includes/admin/class-wc-admin-attributes.php b/includes/admin/class-wc-admin-attributes.php
index db152ac45ca..9dc884fe9e9 100644
--- a/includes/admin/class-wc-admin-attributes.php
+++ b/includes/admin/class-wc-admin-attributes.php
@@ -4,7 +4,7 @@
  *
  * The attributes section lets users add custom attributes to assign to products - they can also be used in the "Filter Products by Attribute" widget.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  * @version 2.3.0
  */
 
diff --git a/includes/admin/class-wc-admin-customize.php b/includes/admin/class-wc-admin-customize.php
index 20834846126..cba3f2b4e68 100644
--- a/includes/admin/class-wc-admin-customize.php
+++ b/includes/admin/class-wc-admin-customize.php
@@ -4,7 +4,7 @@
  *
  * @author   WooCommerce
  * @category Admin
- * @package  WooCommerce/Admin/Customize
+ * @package  WooCommerce\Admin\Customize
  * @version  3.1.0
  */
 
diff --git a/includes/admin/class-wc-admin-dashboard.php b/includes/admin/class-wc-admin-dashboard.php
index 28d1c6b0fe2..8f1a8348405 100644
--- a/includes/admin/class-wc-admin-dashboard.php
+++ b/includes/admin/class-wc-admin-dashboard.php
@@ -2,7 +2,7 @@
 /**
  * Admin Dashboard
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.1.0
  */
 
diff --git a/includes/admin/class-wc-admin-duplicate-product.php b/includes/admin/class-wc-admin-duplicate-product.php
index 4a11254e524..05c67028ac3 100644
--- a/includes/admin/class-wc-admin-duplicate-product.php
+++ b/includes/admin/class-wc-admin-duplicate-product.php
@@ -2,7 +2,7 @@
 /**
  * Duplicate product functionality
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     3.0.0
  */
 
diff --git a/includes/admin/class-wc-admin-exporters.php b/includes/admin/class-wc-admin-exporters.php
index 011d2e1429e..c6dbc48632c 100644
--- a/includes/admin/class-wc-admin-exporters.php
+++ b/includes/admin/class-wc-admin-exporters.php
@@ -2,7 +2,7 @@
 /**
  * Init WooCommerce data exporters.
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     3.1.0
  */
 
diff --git a/includes/admin/class-wc-admin-help.php b/includes/admin/class-wc-admin-help.php
index 334055900b0..aa5bc03a7bf 100644
--- a/includes/admin/class-wc-admin-help.php
+++ b/includes/admin/class-wc-admin-help.php
@@ -2,7 +2,7 @@
 /**
  * Add some content to the help tab
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.1.0
  */
 
diff --git a/includes/admin/class-wc-admin-importers.php b/includes/admin/class-wc-admin-importers.php
index 8f85ad27b60..95f9e3bbca7 100644
--- a/includes/admin/class-wc-admin-importers.php
+++ b/includes/admin/class-wc-admin-importers.php
@@ -2,7 +2,7 @@
 /**
  * Init WooCommerce data importers.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/admin/class-wc-admin-log-table-list.php b/includes/admin/class-wc-admin-log-table-list.php
index 48e51f9bffc..2d9b9225632 100644
--- a/includes/admin/class-wc-admin-log-table-list.php
+++ b/includes/admin/class-wc-admin-log-table-list.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category Admin
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  1.0.0
  */
 
diff --git a/includes/admin/class-wc-admin-meta-boxes.php b/includes/admin/class-wc-admin-meta-boxes.php
index 32e03797591..df1db141968 100644
--- a/includes/admin/class-wc-admin-meta-boxes.php
+++ b/includes/admin/class-wc-admin-meta-boxes.php
@@ -4,7 +4,7 @@
  *
  * Sets up the write panels used by products and orders (custom post types).
  *
- * @package WooCommerce/Admin/Meta Boxes
+ * @package WooCommerce\Admin\Meta Boxes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/admin/class-wc-admin-permalink-settings.php b/includes/admin/class-wc-admin-permalink-settings.php
index ec6534cc142..abcd784d721 100644
--- a/includes/admin/class-wc-admin-permalink-settings.php
+++ b/includes/admin/class-wc-admin-permalink-settings.php
@@ -5,7 +5,7 @@
  * @class       WC_Admin_Permalink_Settings
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.3.0
  */
 
diff --git a/includes/admin/class-wc-admin-pointers.php b/includes/admin/class-wc-admin-pointers.php
index c4020b7f928..23242fe3f8d 100644
--- a/includes/admin/class-wc-admin-pointers.php
+++ b/includes/admin/class-wc-admin-pointers.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category Admin
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  2.4.0
  */
 
diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php
index 41fa6a3c4df..e2354239990 100644
--- a/includes/admin/class-wc-admin-post-types.php
+++ b/includes/admin/class-wc-admin-post-types.php
@@ -2,7 +2,7 @@
 /**
  * Post Types Admin
  *
- * @package  WooCommerce/admin
+ * @package  WooCommerce\Admin
  * @version  3.3.0
  */
 
diff --git a/includes/admin/class-wc-admin-profile.php b/includes/admin/class-wc-admin-profile.php
index 9aafac10e2d..94180722001 100644
--- a/includes/admin/class-wc-admin-profile.php
+++ b/includes/admin/class-wc-admin-profile.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category Admin
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  2.4.0
  */
 
diff --git a/includes/admin/class-wc-admin-reports.php b/includes/admin/class-wc-admin-reports.php
index 541fe67cd1b..0d5dc4372e5 100644
--- a/includes/admin/class-wc-admin-reports.php
+++ b/includes/admin/class-wc-admin-reports.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.0.0
  */
 
diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php
index 1d1a49b8311..20d3d1c1ddc 100644
--- a/includes/admin/class-wc-admin-settings.php
+++ b/includes/admin/class-wc-admin-settings.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Admin Settings Class
  *
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  3.4.0
  */
 
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 1976596f6df..d5402a4bb12 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -4,7 +4,7 @@
  *
  * Takes new users through some basic steps to setup their store.
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.6.0
  */
 
diff --git a/includes/admin/class-wc-admin-status.php b/includes/admin/class-wc-admin-status.php
index 23e670ec8d7..cb7b9387482 100644
--- a/includes/admin/class-wc-admin-status.php
+++ b/includes/admin/class-wc-admin-status.php
@@ -2,7 +2,7 @@
 /**
  * Debug/Status page
  *
- * @package WooCommerce/Admin/System Status
+ * @package WooCommerce\Admin\System Status
  * @version 2.2.0
  */
 
diff --git a/includes/admin/class-wc-admin-taxonomies.php b/includes/admin/class-wc-admin-taxonomies.php
index b5a32d7eb87..bb212d69ff3 100644
--- a/includes/admin/class-wc-admin-taxonomies.php
+++ b/includes/admin/class-wc-admin-taxonomies.php
@@ -4,7 +4,7 @@
  *
  * @class    WC_Admin_Taxonomies
  * @version  2.3.10
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/class-wc-admin.php b/includes/admin/class-wc-admin.php
index 8a9d6e8bd43..e864cd80e1f 100644
--- a/includes/admin/class-wc-admin.php
+++ b/includes/admin/class-wc-admin.php
@@ -3,7 +3,7 @@
  * WooCommerce Admin
  *
  * @class    WC_Admin
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  2.6.0
  */
 
diff --git a/includes/admin/helper/class-wc-helper-api.php b/includes/admin/helper/class-wc-helper-api.php
index e1baf489000..9e7c241ccde 100644
--- a/includes/admin/helper/class-wc-helper-api.php
+++ b/includes/admin/helper/class-wc-helper-api.php
@@ -3,7 +3,7 @@
  * WooCommerce Admin
  *
  * @class    WC_Helper_API
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/helper/class-wc-helper-updater.php b/includes/admin/helper/class-wc-helper-updater.php
index 62941f3f734..3feccb16ac4 100644
--- a/includes/admin/helper/class-wc-helper-updater.php
+++ b/includes/admin/helper/class-wc-helper-updater.php
@@ -3,7 +3,7 @@
  * The update helper for WooCommerce.com plugins.
  *
  * @class WC_Helper_Updater
- * @package WooCommerce/Admin.
+ * @package WooCommerce\Admin.
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/helper/class-wc-helper.php b/includes/admin/helper/class-wc-helper.php
index 40beb7e9493..6ee44dc8e3e 100644
--- a/includes/admin/helper/class-wc-helper.php
+++ b/includes/admin/helper/class-wc-helper.php
@@ -3,7 +3,7 @@
  * WooCommerce Admin
  *
  * @class    WC_Helper
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/admin/helper/views/html-section-nav.php b/includes/admin/helper/views/html-section-nav.php
index 6b6dcf389a5..9af76fe32a0 100644
--- a/includes/admin/helper/views/html-section-nav.php
+++ b/includes/admin/helper/views/html-section-nav.php
@@ -2,7 +2,7 @@
 /**
  * Helper admin navigation.
  *
- * @package WooCommerce/Helper
+ * @package WooCommerce\Helper
  */
 
 defined( 'ABSPATH' ) || exit(); ?>
diff --git a/includes/admin/importers/class-wc-product-csv-importer-controller.php b/includes/admin/importers/class-wc-product-csv-importer-controller.php
index 0d4afc75eed..0de82507fdc 100644
--- a/includes/admin/importers/class-wc-product-csv-importer-controller.php
+++ b/includes/admin/importers/class-wc-product-csv-importer-controller.php
@@ -16,7 +16,7 @@ if ( ! class_exists( 'WP_Importer' ) ) {
 /**
  * Product importer controller - handles file upload and forms in admin.
  *
- * @package     WooCommerce/Admin/Importers
+ * @package     WooCommerce\Admin\Importers
  * @version     3.1.0
  */
 class WC_Product_CSV_Importer_Controller {
diff --git a/includes/admin/importers/class-wc-tax-rate-importer.php b/includes/admin/importers/class-wc-tax-rate-importer.php
index c0693872d8d..79f9cd10c09 100644
--- a/includes/admin/importers/class-wc-tax-rate-importer.php
+++ b/includes/admin/importers/class-wc-tax-rate-importer.php
@@ -3,7 +3,7 @@
  * Tax importer class file
  *
  * @version 2.3.0
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -17,7 +17,7 @@ if ( ! class_exists( 'WP_Importer' ) ) {
 /**
  * Tax Rates importer - import tax rates and local tax rates into WooCommerce.
  *
- * @package     WooCommerce/Admin/Importers
+ * @package     WooCommerce\Admin\Importers
  * @version     2.3.0
  */
 class WC_Tax_Rate_Importer extends WP_Importer {
diff --git a/includes/admin/importers/views/html-product-csv-import-form.php b/includes/admin/importers/views/html-product-csv-import-form.php
index f7e44815c11..3b96ec64f47 100644
--- a/includes/admin/importers/views/html-product-csv-import-form.php
+++ b/includes/admin/importers/views/html-product-csv-import-form.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Product import form
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/list-tables/abstract-class-wc-admin-list-table.php b/includes/admin/list-tables/abstract-class-wc-admin-list-table.php
index f985a80185b..4a0c93d6274 100644
--- a/includes/admin/list-tables/abstract-class-wc-admin-list-table.php
+++ b/includes/admin/list-tables/abstract-class-wc-admin-list-table.php
@@ -2,7 +2,7 @@
 /**
  * List tables.
  *
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  3.3.0
  */
 
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-coupons.php b/includes/admin/list-tables/class-wc-admin-list-table-coupons.php
index dd9cab75a45..5a8ea00c78e 100644
--- a/includes/admin/list-tables/class-wc-admin-list-table-coupons.php
+++ b/includes/admin/list-tables/class-wc-admin-list-table-coupons.php
@@ -2,7 +2,7 @@
 /**
  * List tables: coupons.
  *
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  3.3.0
  */
 
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-orders.php b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
index 87a8619e45a..e76991fe440 100644
--- a/includes/admin/list-tables/class-wc-admin-list-table-orders.php
+++ b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
@@ -2,7 +2,7 @@
 /**
  * List tables: orders.
  *
- * @package WooCommerce\admin
+ * @package WooCommerce\Admin
  * @version 3.3.0
  */
 
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-products.php b/includes/admin/list-tables/class-wc-admin-list-table-products.php
index 6bc4ba30eed..05520130bc7 100644
--- a/includes/admin/list-tables/class-wc-admin-list-table-products.php
+++ b/includes/admin/list-tables/class-wc-admin-list-table-products.php
@@ -2,7 +2,7 @@
 /**
  * List tables: products.
  *
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  * @version  3.3.0
  */
 
diff --git a/includes/admin/marketplace-suggestions/views/container.php b/includes/admin/marketplace-suggestions/views/container.php
index 4799d457990..85071f3106b 100644
--- a/includes/admin/marketplace-suggestions/views/container.php
+++ b/includes/admin/marketplace-suggestions/views/container.php
@@ -2,7 +2,7 @@
 /**
  * Marketplace suggestions container
  *
- * @package  WooCommerce/Templates
+ * @package  WooCommerce\Templates
  * @version  3.6.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
index c8b92d10e2a..5a855e33cec 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.1.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php b/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
index 303bdaad9d3..6e68d641740 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.1.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
index f5568ddb2d1..4c30257d3dd 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.2.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php b/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
index 897842500c0..c519dd78324 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
@@ -4,7 +4,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.1.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-items.php b/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
index a70bea86889..0f5bf54eb74 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.1.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php b/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
index ba34495607e..936a647a1e0 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
@@ -2,7 +2,7 @@
 /**
  * Order Notes
  *
- * @package WooCommerce/Admin/Meta Boxes
+ * @package WooCommerce\Admin\Meta Boxes
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
index 7bbbab50ab2..c1275acf073 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
@@ -4,7 +4,7 @@
  *
  * Displays the product data box, tabbed, with several panels covering price, stock etc.
  *
- * @package  WooCommerce/Admin/Meta Boxes
+ * @package  WooCommerce\Admin\Meta Boxes
  * @version  3.0.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-images.php b/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
index e2553785234..d4a0b5f04dd 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.1.0
  */
 
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php b/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php
index 2b845692997..28e6a11435b 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php
@@ -4,7 +4,7 @@
  *
  * Functions for displaying product reviews data meta box.
  *
- * @package WooCommerce/Admin/Meta Boxes
+ * @package WooCommerce\Admin\Meta Boxes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php b/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
index 736ffcb717a..ab762be2929 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
@@ -4,7 +4,7 @@
  *
  * Replaces the standard excerpt box.
  *
- * @package     WooCommerce/Admin/Meta Boxes
+ * @package     WooCommerce\Admin\Meta Boxes
  * @version     2.1.0
  */
 
diff --git a/includes/admin/meta-boxes/views/html-order-item.php b/includes/admin/meta-boxes/views/html-order-item.php
index 7bee65e2d05..355b9b28a1b 100644
--- a/includes/admin/meta-boxes/views/html-order-item.php
+++ b/includes/admin/meta-boxes/views/html-order-item.php
@@ -2,7 +2,7 @@
 /**
  * Shows an order item
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  * @var object $item The item being displayed
  * @var int $item_id The id of the item being displayed
  */
diff --git a/includes/admin/meta-boxes/views/html-order-items.php b/includes/admin/meta-boxes/views/html-order-items.php
index f5dd34f972e..d300e782745 100644
--- a/includes/admin/meta-boxes/views/html-order-items.php
+++ b/includes/admin/meta-boxes/views/html-order-items.php
@@ -2,7 +2,7 @@
 /**
  * Order items HTML for meta box.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/meta-boxes/views/html-order-notes.php b/includes/admin/meta-boxes/views/html-order-notes.php
index 87015bfa3a4..50db87bcea2 100644
--- a/includes/admin/meta-boxes/views/html-order-notes.php
+++ b/includes/admin/meta-boxes/views/html-order-notes.php
@@ -2,7 +2,7 @@
 /**
  * Order notes HTML for meta box.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/meta-boxes/views/html-order-shipping.php b/includes/admin/meta-boxes/views/html-order-shipping.php
index 38bc004b5e8..6350fb1f9f1 100644
--- a/includes/admin/meta-boxes/views/html-order-shipping.php
+++ b/includes/admin/meta-boxes/views/html-order-shipping.php
@@ -2,12 +2,12 @@
 /**
  * Shows a shipping line
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  *
  * @var object $item The item being displayed
  * @var int $item_id The id of the item being displayed
  *
- * @package WooCommerce/Admin/Views
+ * @package WooCommerce\Admin\Views
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/meta-boxes/views/html-product-data-general.php b/includes/admin/meta-boxes/views/html-product-data-general.php
index 3b2e476c538..281a3c573d9 100644
--- a/includes/admin/meta-boxes/views/html-product-data-general.php
+++ b/includes/admin/meta-boxes/views/html-product-data-general.php
@@ -2,7 +2,7 @@
 /**
  * Product general data panel.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/meta-boxes/views/html-product-data-linked-products.php b/includes/admin/meta-boxes/views/html-product-data-linked-products.php
index 2a7a0938db9..703bce477f4 100644
--- a/includes/admin/meta-boxes/views/html-product-data-linked-products.php
+++ b/includes/admin/meta-boxes/views/html-product-data-linked-products.php
@@ -2,7 +2,7 @@
 /**
  * Linked product options.
  *
- * @package WooCommerce/admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/meta-boxes/views/html-product-data-panel.php b/includes/admin/meta-boxes/views/html-product-data-panel.php
index 5fd93719b65..5393f85d464 100644
--- a/includes/admin/meta-boxes/views/html-product-data-panel.php
+++ b/includes/admin/meta-boxes/views/html-product-data-panel.php
@@ -2,7 +2,7 @@
 /**
  * Product data meta box.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/plugin-updates/class-wc-plugin-updates.php b/includes/admin/plugin-updates/class-wc-plugin-updates.php
index fa64bcce0b4..dd7ce5c1d5b 100644
--- a/includes/admin/plugin-updates/class-wc-plugin-updates.php
+++ b/includes/admin/plugin-updates/class-wc-plugin-updates.php
@@ -2,7 +2,7 @@
 /**
  * Class for displaying plugin warning notifications and determining 3rd party plugin compatibility.
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     3.2.0
  */
 
diff --git a/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php b/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
index a7a048db15a..ad24e66848e 100644
--- a/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
+++ b/includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
@@ -2,7 +2,7 @@
 /**
  * Manages WooCommerce plugin updating on the Plugins screen.
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     3.2.0
  */
 
diff --git a/includes/admin/plugin-updates/class-wc-updates-screen-updates.php b/includes/admin/plugin-updates/class-wc-updates-screen-updates.php
index 5e55da51488..60510100610 100644
--- a/includes/admin/plugin-updates/class-wc-updates-screen-updates.php
+++ b/includes/admin/plugin-updates/class-wc-updates-screen-updates.php
@@ -2,7 +2,7 @@
 /**
  * Manages WooCommerce plugin updating on the Updates screen.
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     3.2.0
  */
 
diff --git a/includes/admin/reports/class-wc-admin-report.php b/includes/admin/reports/class-wc-admin-report.php
index ca634b47c6e..d6dceb681f5 100644
--- a/includes/admin/reports/class-wc-admin-report.php
+++ b/includes/admin/reports/class-wc-admin-report.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Admin_Report {
diff --git a/includes/admin/reports/class-wc-report-coupon-usage.php b/includes/admin/reports/class-wc-report-coupon-usage.php
index c04be027c7f..c2bddf2fd26 100644
--- a/includes/admin/reports/class-wc-report-coupon-usage.php
+++ b/includes/admin/reports/class-wc-report-coupon-usage.php
@@ -2,7 +2,7 @@
 /**
  * Coupon usage report functionality
  *
- * @package WooCommerce/Admin/Reports
+ * @package WooCommerce\Admin\Reports
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Coupon_Usage extends WC_Admin_Report {
diff --git a/includes/admin/reports/class-wc-report-customer-list.php b/includes/admin/reports/class-wc-report-customer-list.php
index 36f47c9b24d..e223570b7b9 100644
--- a/includes/admin/reports/class-wc-report-customer-list.php
+++ b/includes/admin/reports/class-wc-report-customer-list.php
@@ -16,7 +16,7 @@ if ( ! class_exists( 'WP_List_Table' ) ) {
 /**
  * WC_Report_Customer_List.
  *
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Customer_List extends WP_List_Table {
diff --git a/includes/admin/reports/class-wc-report-customers.php b/includes/admin/reports/class-wc-report-customers.php
index 4b949d2180d..0096a73f993 100644
--- a/includes/admin/reports/class-wc-report-customers.php
+++ b/includes/admin/reports/class-wc-report-customers.php
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * WC_Report_Customers
  *
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Customers extends WC_Admin_Report {
diff --git a/includes/admin/reports/class-wc-report-downloads.php b/includes/admin/reports/class-wc-report-downloads.php
index ff326ab01df..fcedb69eecf 100644
--- a/includes/admin/reports/class-wc-report-downloads.php
+++ b/includes/admin/reports/class-wc-report-downloads.php
@@ -4,7 +4,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     3.3.0
  */
 
diff --git a/includes/admin/reports/class-wc-report-low-in-stock.php b/includes/admin/reports/class-wc-report-low-in-stock.php
index 80ade878d4a..ed69b074bd6 100644
--- a/includes/admin/reports/class-wc-report-low-in-stock.php
+++ b/includes/admin/reports/class-wc-report-low-in-stock.php
@@ -2,7 +2,7 @@
 /**
  * WC_Report_Low_In_Stock.
  *
- * @package WooCommerce/Admin/Reports
+ * @package WooCommerce\Admin\Reports
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/reports/class-wc-report-most-stocked.php b/includes/admin/reports/class-wc-report-most-stocked.php
index 5d018f9df86..26058d43cf4 100644
--- a/includes/admin/reports/class-wc-report-most-stocked.php
+++ b/includes/admin/reports/class-wc-report-most-stocked.php
@@ -2,7 +2,7 @@
 /**
  * WC_Report_Most_Stocked.
  *
- * @package WooCommerce/Admin/Reports
+ * @package WooCommerce\Admin\Reports
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/reports/class-wc-report-out-of-stock.php b/includes/admin/reports/class-wc-report-out-of-stock.php
index 1e4a9940250..9eb594ad9a0 100644
--- a/includes/admin/reports/class-wc-report-out-of-stock.php
+++ b/includes/admin/reports/class-wc-report-out-of-stock.php
@@ -2,7 +2,7 @@
 /**
  * WC_Report_Out_Of_Stock.
  *
- * @package WooCommerce/Admin/Reports
+ * @package WooCommerce\Admin\Reports
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/reports/class-wc-report-sales-by-category.php b/includes/admin/reports/class-wc-report-sales-by-category.php
index 2a445eedea2..390e9de2c24 100644
--- a/includes/admin/reports/class-wc-report-sales-by-category.php
+++ b/includes/admin/reports/class-wc-report-sales-by-category.php
@@ -2,7 +2,7 @@
 /**
  * Sales by category report functionality
  *
- * @package WooCommerce/Admin/Reporting
+ * @package WooCommerce\Admin\Reporting
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Sales_By_Category extends WC_Admin_Report {
diff --git a/includes/admin/reports/class-wc-report-sales-by-date.php b/includes/admin/reports/class-wc-report-sales-by-date.php
index ae0b41146c7..10938ee633d 100644
--- a/includes/admin/reports/class-wc-report-sales-by-date.php
+++ b/includes/admin/reports/class-wc-report-sales-by-date.php
@@ -2,7 +2,7 @@
 /**
  * WC_Report_Sales_By_Date
  *
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 
diff --git a/includes/admin/reports/class-wc-report-sales-by-product.php b/includes/admin/reports/class-wc-report-sales-by-product.php
index f8f666252d6..69ae0b4c4a7 100644
--- a/includes/admin/reports/class-wc-report-sales-by-product.php
+++ b/includes/admin/reports/class-wc-report-sales-by-product.php
@@ -2,7 +2,7 @@
 /**
  * Sales By Product Reporting
  *
- * @package WooCommerce/Admin/Reporting
+ * @package WooCommerce\Admin\Reporting
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * WC_Report_Sales_By_Product
  *
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Sales_By_Product extends WC_Admin_Report {
diff --git a/includes/admin/reports/class-wc-report-stock.php b/includes/admin/reports/class-wc-report-stock.php
index e9b6a4c93cd..e656ae0156c 100644
--- a/includes/admin/reports/class-wc-report-stock.php
+++ b/includes/admin/reports/class-wc-report-stock.php
@@ -13,7 +13,7 @@ if ( ! class_exists( 'WP_List_Table' ) ) {
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Stock extends WP_List_Table {
diff --git a/includes/admin/reports/class-wc-report-taxes-by-code.php b/includes/admin/reports/class-wc-report-taxes-by-code.php
index 024b4c3c383..a76375904e1 100644
--- a/includes/admin/reports/class-wc-report-taxes-by-code.php
+++ b/includes/admin/reports/class-wc-report-taxes-by-code.php
@@ -2,7 +2,7 @@
 /**
  * Taxes by tax code report.
  *
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * WC_Report_Taxes_By_Code
  *
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Taxes_By_Code extends WC_Admin_Report {
diff --git a/includes/admin/reports/class-wc-report-taxes-by-date.php b/includes/admin/reports/class-wc-report-taxes-by-date.php
index cd52454c982..37328325bda 100644
--- a/includes/admin/reports/class-wc-report-taxes-by-date.php
+++ b/includes/admin/reports/class-wc-report-taxes-by-date.php
@@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin/Reports
+ * @package     WooCommerce\Admin\Reports
  * @version     2.1.0
  */
 class WC_Report_Taxes_By_Date extends WC_Admin_Report {
diff --git a/includes/admin/settings/class-wc-settings-accounts.php b/includes/admin/settings/class-wc-settings-accounts.php
index 3ecf58c01b1..73802e61bdb 100644
--- a/includes/admin/settings/class-wc-settings-accounts.php
+++ b/includes/admin/settings/class-wc-settings-accounts.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Account Settings.
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/settings/class-wc-settings-advanced.php b/includes/admin/settings/class-wc-settings-advanced.php
index 5056d4fdba8..13896e8a27c 100644
--- a/includes/admin/settings/class-wc-settings-advanced.php
+++ b/includes/admin/settings/class-wc-settings-advanced.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce advanced settings
  *
- * @package  WooCommerce/Admin
+ * @package  WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/settings/class-wc-settings-emails.php b/includes/admin/settings/class-wc-settings-emails.php
index 00df3150196..9b4c524ebc5 100644
--- a/includes/admin/settings/class-wc-settings-emails.php
+++ b/includes/admin/settings/class-wc-settings-emails.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Email Settings
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  * @version 2.1.0
  */
 
diff --git a/includes/admin/settings/class-wc-settings-general.php b/includes/admin/settings/class-wc-settings-general.php
index 6e0126b00da..8535dd7f956 100644
--- a/includes/admin/settings/class-wc-settings-general.php
+++ b/includes/admin/settings/class-wc-settings-general.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce General Settings
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/settings/class-wc-settings-integrations.php b/includes/admin/settings/class-wc-settings-integrations.php
index 248287f059f..b5859b6d155 100644
--- a/includes/admin/settings/class-wc-settings-integrations.php
+++ b/includes/admin/settings/class-wc-settings-integrations.php
@@ -4,7 +4,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.1.0
  */
 
diff --git a/includes/admin/settings/class-wc-settings-page.php b/includes/admin/settings/class-wc-settings-page.php
index 90b8cc8090a..b652182da23 100644
--- a/includes/admin/settings/class-wc-settings-page.php
+++ b/includes/admin/settings/class-wc-settings-page.php
@@ -4,7 +4,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.1.0
  */
 
diff --git a/includes/admin/settings/class-wc-settings-payment-gateways.php b/includes/admin/settings/class-wc-settings-payment-gateways.php
index 48c67e90a87..463f7ad9154 100644
--- a/includes/admin/settings/class-wc-settings-payment-gateways.php
+++ b/includes/admin/settings/class-wc-settings-payment-gateways.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Checkout Settings
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/settings/class-wc-settings-products.php b/includes/admin/settings/class-wc-settings-products.php
index 6c7d885a1db..35a63f78b02 100644
--- a/includes/admin/settings/class-wc-settings-products.php
+++ b/includes/admin/settings/class-wc-settings-products.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Product Settings
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  * @version 2.4.0
  */
 
diff --git a/includes/admin/settings/class-wc-settings-shipping.php b/includes/admin/settings/class-wc-settings-shipping.php
index 11e66d59a5d..79183328c30 100644
--- a/includes/admin/settings/class-wc-settings-shipping.php
+++ b/includes/admin/settings/class-wc-settings-shipping.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Shipping Settings
  *
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.6.0
  */
 
diff --git a/includes/admin/settings/class-wc-settings-tax.php b/includes/admin/settings/class-wc-settings-tax.php
index 739674e7092..8f489ffd6cd 100644
--- a/includes/admin/settings/class-wc-settings-tax.php
+++ b/includes/admin/settings/class-wc-settings-tax.php
@@ -4,7 +4,7 @@
  *
  * @author      WooThemes
  * @category    Admin
- * @package     WooCommerce/Admin
+ * @package     WooCommerce\Admin
  * @version     2.1.0
  */
 
diff --git a/includes/admin/settings/views/html-admin-page-shipping-classes.php b/includes/admin/settings/views/html-admin-page-shipping-classes.php
index 33d8f471201..ed2c906409a 100644
--- a/includes/admin/settings/views/html-admin-page-shipping-classes.php
+++ b/includes/admin/settings/views/html-admin-page-shipping-classes.php
@@ -2,7 +2,7 @@
 /**
  * Shipping classes admin
  *
- * @package WooCommerce/Admin/Shipping
+ * @package WooCommerce\Admin\Shipping
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
index 8bc70e58312..d2af3e72481 100644
--- a/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
+++ b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
@@ -2,7 +2,7 @@
 /**
  * Shipping zone admin
  *
- * @package WooCommerce/Admin/Shipping
+ * @package WooCommerce\Admin\Shipping
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/settings/views/html-keys-edit.php b/includes/admin/settings/views/html-keys-edit.php
index 7f317a7ced9..04da58e51cf 100644
--- a/includes/admin/settings/views/html-keys-edit.php
+++ b/includes/admin/settings/views/html-keys-edit.php
@@ -2,7 +2,7 @@
 /**
  * Admin view: Edit API keys
  *
- * @package WooCommerce/Admin/Settings
+ * @package WooCommerce\Admin\Settings
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/settings/views/html-settings-tax.php b/includes/admin/settings/views/html-settings-tax.php
index 98b6e910527..15a7a95cfbd 100644
--- a/includes/admin/settings/views/html-settings-tax.php
+++ b/includes/admin/settings/views/html-settings-tax.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Admin view: Settings tax
+ *
+ * @package WooCommerce\Admin\Settings
+ */
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php
index 831bfec2a33..eaaf56dd984 100644
--- a/includes/admin/settings/views/html-webhooks-edit.php
+++ b/includes/admin/settings/views/html-webhooks-edit.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Edit Webhooks
  *
- * @package WooCommerce/Admin/Webhooks/Views
+ * @package WooCommerce\Admin\Webhooks\Views
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/settings/views/settings-tax.php b/includes/admin/settings/views/settings-tax.php
index 352a1314cd8..ebca6747a61 100644
--- a/includes/admin/settings/views/settings-tax.php
+++ b/includes/admin/settings/views/settings-tax.php
@@ -2,7 +2,7 @@
 /**
  * Tax settings.
  *
- * @package Settings.
+ * @package WooCommerce\Admin\Settings.
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php
index c2ac052b7e3..fcb0a1d8dd4 100644
--- a/includes/admin/views/html-admin-page-addons.php
+++ b/includes/admin/views/html-admin-page-addons.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Page - Addons
  *
- * @package WooCommerce/Admin
+ * @package WooCommerce\Admin
  * @var string $view
  * @var object $addons
  */
diff --git a/includes/admin/views/html-admin-page-product-export.php b/includes/admin/views/html-admin-page-product-export.php
index 4f1c1c5b687..6ea370f9ec8 100644
--- a/includes/admin/views/html-admin-page-product-export.php
+++ b/includes/admin/views/html-admin-page-product-export.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Product Export
  *
- * @package WooCommerce/Admin/Export
+ * @package WooCommerce\Admin\Export
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/views/html-admin-page-status-logs-db.php b/includes/admin/views/html-admin-page-status-logs-db.php
index 38013c0e571..317fe5c1896 100644
--- a/includes/admin/views/html-admin-page-status-logs-db.php
+++ b/includes/admin/views/html-admin-page-status-logs-db.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Page - Status Database Logs
  *
- * @package WooCommerce/Admin/Logs
+ * @package WooCommerce\Admin\Logs
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/views/html-admin-page-status-logs.php b/includes/admin/views/html-admin-page-status-logs.php
index 0f5810e79b4..8bb41503a21 100644
--- a/includes/admin/views/html-admin-page-status-logs.php
+++ b/includes/admin/views/html-admin-page-status-logs.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Page - Status Logs
  *
- * @package WooCommerce/Admin/Logs
+ * @package WooCommerce\Admin\Logs
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/views/html-notice-regenerating-lookup-table.php b/includes/admin/views/html-notice-regenerating-lookup-table.php
index 8cf8bceb887..32c50aae07a 100644
--- a/includes/admin/views/html-notice-regenerating-lookup-table.php
+++ b/includes/admin/views/html-notice-regenerating-lookup-table.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Notice - Regenerating product lookup table.
  *
- * @package WooCommerce/admin
+ * @package WooCommerce\Admin
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/admin/views/html-notice-template-check.php b/includes/admin/views/html-notice-template-check.php
index 64742018040..50e2f3131b6 100644
--- a/includes/admin/views/html-notice-template-check.php
+++ b/includes/admin/views/html-notice-template-check.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Notice - Template Check
  *
- * @package WooCommerce/Views
+ * @package WooCommerce\Views
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/views/html-quick-edit-product.php b/includes/admin/views/html-quick-edit-product.php
index b97a00b22b4..3fe48767cbd 100644
--- a/includes/admin/views/html-quick-edit-product.php
+++ b/includes/admin/views/html-quick-edit-product.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Quick Edit Product
  *
- * @package admin.
+ * @package WooCommerce\Admin\Notices
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/admin/views/html-report-by-date.php b/includes/admin/views/html-report-by-date.php
index c01da6f3b5d..860226a9ccc 100644
--- a/includes/admin/views/html-report-by-date.php
+++ b/includes/admin/views/html-report-by-date.php
@@ -2,7 +2,7 @@
 /**
  * Admin View: Report by Date (with date filters)
  *
- * @package WooCommerce/Admin/Reporting
+ * @package WooCommerce\Admin\Reporting
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php
index d5990e40eeb..bc9ae3c3ce9 100644
--- a/includes/admin/wc-admin-functions.php
+++ b/includes/admin/wc-admin-functions.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Admin Functions
  *
- * @package  WooCommerce/Admin/Functions
+ * @package  WooCommerce\Admin\Functions
  * @version  2.4.0
  */
 
diff --git a/includes/admin/wc-meta-box-functions.php b/includes/admin/wc-meta-box-functions.php
index 61c451b3484..4c513a48179 100644
--- a/includes/admin/wc-meta-box-functions.php
+++ b/includes/admin/wc-meta-box-functions.php
@@ -4,7 +4,7 @@
  *
  * @author      WooThemes
  * @category    Core
- * @package     WooCommerce/Admin/Functions
+ * @package     WooCommerce\Admin\Functions
  * @version     2.3.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/class-wc-ajax.php b/includes/class-wc-ajax.php
index 1ca5a3129a4..cd66f49d167 100644
--- a/includes/class-wc-ajax.php
+++ b/includes/class-wc-ajax.php
@@ -3,7 +3,7 @@
  * WooCommerce WC_AJAX. AJAX Event Handlers.
  *
  * @class   WC_AJAX
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/class-wc-api.php b/includes/class-wc-api.php
index dad7e3c7330..2789331fbe7 100644
--- a/includes/class-wc-api.php
+++ b/includes/class-wc-api.php
@@ -7,7 +7,7 @@
  * - Legacy REST API - Deprecated in 2.6.0. @see class-wc-legacy-api.php
  * - WP REST API - The main REST API in WooCommerce which is built on top of the WP REST API.
  *
- * @package WooCommerce/API
+ * @package WooCommerce\API
  * @since   2.0.0
  */
 
diff --git a/includes/class-wc-auth.php b/includes/class-wc-auth.php
index b6754497b69..6afa9bfa392 100644
--- a/includes/class-wc-auth.php
+++ b/includes/class-wc-auth.php
@@ -4,7 +4,7 @@
  *
  * Handles wc-auth endpoint requests.
  *
- * @package WooCommerce/API
+ * @package WooCommerce\API
  * @since   2.4.0
  */
 
diff --git a/includes/class-wc-autoloader.php b/includes/class-wc-autoloader.php
index 480eddc3f5d..03153518d2c 100644
--- a/includes/class-wc-autoloader.php
+++ b/includes/class-wc-autoloader.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Autoloader.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 2.3.0
  */
 
diff --git a/includes/class-wc-background-emailer.php b/includes/class-wc-background-emailer.php
index 331fa87a27f..5c9d751e07f 100644
--- a/includes/class-wc-background-emailer.php
+++ b/includes/class-wc-background-emailer.php
@@ -3,7 +3,7 @@
  * Background Emailer
  *
  * @version 3.0.1
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/class-wc-background-updater.php b/includes/class-wc-background-updater.php
index a1253f6c4a2..424bb93262f 100644
--- a/includes/class-wc-background-updater.php
+++ b/includes/class-wc-background-updater.php
@@ -4,7 +4,7 @@
  *
  * @version 2.6.0
  * @deprecated 3.6.0 Replaced with queue.
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-breadcrumb.php b/includes/class-wc-breadcrumb.php
index 1a3aa6dc909..592fe86c53f 100644
--- a/includes/class-wc-breadcrumb.php
+++ b/includes/class-wc-breadcrumb.php
@@ -2,7 +2,7 @@
 /**
  * WC_Breadcrumb class.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 2.3.0
  */
 
diff --git a/includes/class-wc-cache-helper.php b/includes/class-wc-cache-helper.php
index e526659cbea..781fd735bea 100644
--- a/includes/class-wc-cache-helper.php
+++ b/includes/class-wc-cache-helper.php
@@ -2,7 +2,7 @@
 /**
  * WC_Cache_Helper class.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-cart-fees.php b/includes/class-wc-cart-fees.php
index 6f5a29f5203..f80376f996a 100644
--- a/includes/class-wc-cart-fees.php
+++ b/includes/class-wc-cart-fees.php
@@ -6,7 +6,7 @@
  *
  * We suggest using the action woocommerce_cart_calculate_fees hook for adding fees.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.2.0
  */
 
diff --git a/includes/class-wc-cart-session.php b/includes/class-wc-cart-session.php
index 2bb0db176f6..d8eb30ca8e9 100644
--- a/includes/class-wc-cart-session.php
+++ b/includes/class-wc-cart-session.php
@@ -2,7 +2,7 @@
 /**
  * Cart session handling class.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.2.0
  */
 
diff --git a/includes/class-wc-cart-totals.php b/includes/class-wc-cart-totals.php
index 1ab3a15f5a9..a08c1847416 100644
--- a/includes/class-wc-cart-totals.php
+++ b/includes/class-wc-cart-totals.php
@@ -9,7 +9,7 @@
  * - if something is being stored e.g. item total, store unrounded. This is so taxes can be recalculated later accurately.
  * - if calculating a total, round (if settings allow).
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.2.0
  */
 
diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
index 6069029583a..9e2540a9120 100644
--- a/includes/class-wc-cart.php
+++ b/includes/class-wc-cart.php
@@ -5,7 +5,7 @@
  * The WooCommerce cart class stores cart data and active coupons as well as handling customer sessions and some cart related urls.
  * The cart class also has a price calculation function which calls upon other classes to calculate totals.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 2.1.0
  */
 
diff --git a/includes/class-wc-checkout.php b/includes/class-wc-checkout.php
index 955efb49726..195c8c2d7e5 100644
--- a/includes/class-wc-checkout.php
+++ b/includes/class-wc-checkout.php
@@ -4,7 +4,7 @@
  *
  * The WooCommerce checkout class handles the checkout process, collecting user data and processing the payment.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.4.0
  */
 
diff --git a/includes/class-wc-comments.php b/includes/class-wc-comments.php
index ab4e6945f01..2900e97d5e2 100644
--- a/includes/class-wc-comments.php
+++ b/includes/class-wc-comments.php
@@ -4,7 +4,7 @@
  *
  * Handle comments (reviews and order notes).
  *
- * @package WooCommerce/Classes/Products
+ * @package WooCommerce\Classes\Products
  * @version 2.3.0
  */
 
diff --git a/includes/class-wc-coupon.php b/includes/class-wc-coupon.php
index 5ca6867a5a8..9ef9e02319a 100644
--- a/includes/class-wc-coupon.php
+++ b/includes/class-wc-coupon.php
@@ -4,7 +4,7 @@
  *
  * The WooCommerce coupons class gets coupon data from storage and checks coupon validity.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  */
 
diff --git a/includes/class-wc-customer-download-log.php b/includes/class-wc-customer-download-log.php
index 37d6e1ea23f..cec6c05095a 100644
--- a/includes/class-wc-customer-download-log.php
+++ b/includes/class-wc-customer-download-log.php
@@ -2,7 +2,7 @@
 /**
  * Class for customer download logs.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.3.0
  * @since   3.3.0
  */
diff --git a/includes/class-wc-customer-download.php b/includes/class-wc-customer-download.php
index 26dadb0f46d..1e1a6d35323 100644
--- a/includes/class-wc-customer-download.php
+++ b/includes/class-wc-customer-download.php
@@ -2,7 +2,7 @@
 /**
  * Class for customer download permissions.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-customer.php b/includes/class-wc-customer.php
index 4f338a9dd40..cb648fc83da 100644
--- a/includes/class-wc-customer.php
+++ b/includes/class-wc-customer.php
@@ -2,7 +2,7 @@
 /**
  * The WooCommerce customer class handles storage of the current customer's data, such as location.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  */
 
diff --git a/includes/class-wc-datetime.php b/includes/class-wc-datetime.php
index 233f7953aba..1778503d5d1 100644
--- a/includes/class-wc-datetime.php
+++ b/includes/class-wc-datetime.php
@@ -4,7 +4,7 @@
  * timezone is absent
  *
  * @since   3.0.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-discounts.php b/includes/class-wc-discounts.php
index 2a11b517510..f1086810f78 100644
--- a/includes/class-wc-discounts.php
+++ b/includes/class-wc-discounts.php
@@ -2,7 +2,7 @@
 /**
  * Discount calculation
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @since   3.2.0
  */
 
diff --git a/includes/class-wc-download-handler.php b/includes/class-wc-download-handler.php
index 1d4ae53abe5..a2826527f43 100644
--- a/includes/class-wc-download-handler.php
+++ b/includes/class-wc-download-handler.php
@@ -4,7 +4,7 @@
  *
  * Handle digital downloads.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 2.2.0
  */
 
diff --git a/includes/class-wc-emails.php b/includes/class-wc-emails.php
index 2d2f4d24c8d..a097a629e75 100644
--- a/includes/class-wc-emails.php
+++ b/includes/class-wc-emails.php
@@ -4,7 +4,7 @@
  *
  * WooCommerce Emails Class which handles the sending on transactional emails and email templates. This class loads in available emails.
  *
- * @package WooCommerce/Classes/Emails
+ * @package WooCommerce\Classes\Emails
  * @version 2.3.0
  */
 
diff --git a/includes/class-wc-embed.php b/includes/class-wc-embed.php
index 296e89c7040..da14279a749 100644
--- a/includes/class-wc-embed.php
+++ b/includes/class-wc-embed.php
@@ -3,7 +3,7 @@
  * WooCommerce product embed
  *
  * @version  2.4.11
- * @package  WooCommerce/Classes/Embed
+ * @package  WooCommerce\Classes\Embed
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/class-wc-form-handler.php b/includes/class-wc-form-handler.php
index 80a4336aba5..e64a0b3fcb6 100644
--- a/includes/class-wc-form-handler.php
+++ b/includes/class-wc-form-handler.php
@@ -2,7 +2,7 @@
 /**
  * Handle frontend forms.
  *
- * @package WooCommerce/Classes/
+ * @package WooCommerce\Classes\
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-frontend-scripts.php b/includes/class-wc-frontend-scripts.php
index 935f0696803..ffd18d99dea 100644
--- a/includes/class-wc-frontend-scripts.php
+++ b/includes/class-wc-frontend-scripts.php
@@ -2,7 +2,7 @@
 /**
  * Handle frontend scripts
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 2.3.0
  */
 
diff --git a/includes/class-wc-geo-ip.php b/includes/class-wc-geo-ip.php
index 9aeb5afc1c2..c79be25b985 100644
--- a/includes/class-wc-geo-ip.php
+++ b/includes/class-wc-geo-ip.php
@@ -4,7 +4,7 @@
  *
  * This class is a fork of GeoIP class from MaxMind LLC.
  *
- * @package    WooCommerce/Classes
+ * @package    WooCommerce\Classes
  * @version    2.4.0
  * @deprecated 3.4.0
  */
diff --git a/includes/class-wc-geolocation.php b/includes/class-wc-geolocation.php
index 64cf628f956..97d918404ab 100644
--- a/includes/class-wc-geolocation.php
+++ b/includes/class-wc-geolocation.php
@@ -6,7 +6,7 @@
  *
  * This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.9.0
  */
 
diff --git a/includes/class-wc-https.php b/includes/class-wc-https.php
index de3e6f4ce85..84e3aeddd7b 100644
--- a/includes/class-wc-https.php
+++ b/includes/class-wc-https.php
@@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class    WC_HTTPS
  * @version  2.2.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @category Class
  * @author   WooThemes
  */
diff --git a/includes/class-wc-install.php b/includes/class-wc-install.php
index 9f36a10493e..6a45e7b726a 100644
--- a/includes/class-wc-install.php
+++ b/includes/class-wc-install.php
@@ -2,7 +2,7 @@
 /**
  * Installation related functions and actions.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  */
 
diff --git a/includes/class-wc-integrations.php b/includes/class-wc-integrations.php
index 13d906060a2..f29360b011b 100644
--- a/includes/class-wc-integrations.php
+++ b/includes/class-wc-integrations.php
@@ -5,7 +5,7 @@
  * Loads Integrations into WooCommerce.
  *
  * @version 3.9.0
- * @package WooCommerce/Classes/Integrations
+ * @package WooCommerce\Classes\Integrations
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-log-levels.php b/includes/class-wc-log-levels.php
index 0f635de92bd..f577b55c4c6 100644
--- a/includes/class-wc-log-levels.php
+++ b/includes/class-wc-log-levels.php
@@ -3,7 +3,7 @@
  * Standard log levels
  *
  * @version 3.2.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-logger.php b/includes/class-wc-logger.php
index 41bb7f6db2e..040dd580529 100644
--- a/includes/class-wc-logger.php
+++ b/includes/class-wc-logger.php
@@ -4,7 +4,7 @@
  *
  * @class          WC_Logger
  * @version        2.0.0
- * @package        WooCommerce/Classes
+ * @package        WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/class-wc-order-factory.php b/includes/class-wc-order-factory.php
index bc67f4b8a03..a3077871813 100644
--- a/includes/class-wc-order-factory.php
+++ b/includes/class-wc-order-factory.php
@@ -5,7 +5,7 @@
  * The WooCommerce order factory creating the right order objects.
  *
  * @version 3.0.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-order-item-coupon.php b/includes/class-wc-order-item-coupon.php
index 5aada6cb307..1a8aa50702a 100644
--- a/includes/class-wc-order-item-coupon.php
+++ b/includes/class-wc-order-item-coupon.php
@@ -2,7 +2,7 @@
 /**
  * Order Line Item (coupon)
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-order-item-fee.php b/includes/class-wc-order-item-fee.php
index 7b280f05795..44e1ee12d2c 100644
--- a/includes/class-wc-order-item-fee.php
+++ b/includes/class-wc-order-item-fee.php
@@ -5,7 +5,7 @@
  * Fee is an amount of money charged for a particular piece of work
  * or for a particular right or service, and not supposed to be negative.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-order-item-meta.php b/includes/class-wc-order-item-meta.php
index 2d2f72f03f9..693be232328 100644
--- a/includes/class-wc-order-item-meta.php
+++ b/includes/class-wc-order-item-meta.php
@@ -4,7 +4,7 @@
  *
  * A Simple class for managing order item meta so plugins add it in the correct format.
  *
- * @package     WooCommerce/Classes
+ * @package     WooCommerce\Classes
  * @deprecated  3.0.0 wc_display_item_meta function is used instead.
  * @version     2.4
  */
diff --git a/includes/class-wc-order-item-product.php b/includes/class-wc-order-item-product.php
index 24e8aab66ce..a32a6268357 100644
--- a/includes/class-wc-order-item-product.php
+++ b/includes/class-wc-order-item-product.php
@@ -2,7 +2,7 @@
 /**
  * Order Line Item (product)
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-order-item-shipping.php b/includes/class-wc-order-item-shipping.php
index c5ca078127d..6602e87ae24 100644
--- a/includes/class-wc-order-item-shipping.php
+++ b/includes/class-wc-order-item-shipping.php
@@ -2,7 +2,7 @@
 /**
  * Order Line Item (shipping)
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-order-item-tax.php b/includes/class-wc-order-item-tax.php
index ac34b61eccb..c41e3881f9f 100644
--- a/includes/class-wc-order-item-tax.php
+++ b/includes/class-wc-order-item-tax.php
@@ -2,7 +2,7 @@
 /**
  * Order Line Item (tax)
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-order-item.php b/includes/class-wc-order-item.php
index 6bc4df36c23..e7c916157cb 100644
--- a/includes/class-wc-order-item.php
+++ b/includes/class-wc-order-item.php
@@ -5,7 +5,7 @@
  * A class which represents an item within an order and handles CRUD.
  * Uses ArrayAccess to be BW compatible with WC_Orders::get_items().
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-order-query.php b/includes/class-wc-order-query.php
index 8069ddd5e4d..4f481c8d0ef 100644
--- a/includes/class-wc-order-query.php
+++ b/includes/class-wc-order-query.php
@@ -3,7 +3,7 @@
  * Parameter-based Order querying
  * Args and usage: https://github.com/woocommerce/woocommerce/wiki/wc_get_orders-and-WC_Order_Query
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.1.0
  * @since   3.1.0
  */
diff --git a/includes/class-wc-order-refund.php b/includes/class-wc-order-refund.php
index d5a8518e5be..c384d044d65 100644
--- a/includes/class-wc-order-refund.php
+++ b/includes/class-wc-order-refund.php
@@ -4,7 +4,7 @@
  * contain much of the same data.
  *
  * @version 3.0.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-payment-gateways.php b/includes/class-wc-payment-gateways.php
index b7701cc758f..c6114ef68c7 100644
--- a/includes/class-wc-payment-gateways.php
+++ b/includes/class-wc-payment-gateways.php
@@ -5,7 +5,7 @@
  * Loads payment gateways via hooks for use in the store.
  *
  * @version 2.2.0
- * @package WooCommerce/Classes/Payment
+ * @package WooCommerce\Classes\Payment
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-payment-tokens.php b/includes/class-wc-payment-tokens.php
index 8b56f5b4a87..85625d02acc 100644
--- a/includes/class-wc-payment-tokens.php
+++ b/includes/class-wc-payment-tokens.php
@@ -4,7 +4,7 @@
  *
  * An API for storing and managing tokens for gateways and customers.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   2.6.0
  */
diff --git a/includes/class-wc-post-data.php b/includes/class-wc-post-data.php
index 6c0b7e31505..39b89ba29b9 100644
--- a/includes/class-wc-post-data.php
+++ b/includes/class-wc-post-data.php
@@ -4,7 +4,7 @@
  *
  * Standardises certain post data on save.
  *
- * @package WooCommerce/Classes/Data
+ * @package WooCommerce\Classes\Data
  * @version 2.2.0
  */
 
diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php
index 36382e5fae3..79c65823ccc 100644
--- a/includes/class-wc-post-types.php
+++ b/includes/class-wc-post-types.php
@@ -4,7 +4,7 @@
  *
  * Registers post types and taxonomies.
  *
- * @package WooCommerce/Classes/Products
+ * @package WooCommerce\Classes\Products
  * @version 2.5.0
  */
 
diff --git a/includes/class-wc-privacy-background-process.php b/includes/class-wc-privacy-background-process.php
index 468b214bce0..f75fa4261da 100644
--- a/includes/class-wc-privacy-background-process.php
+++ b/includes/class-wc-privacy-background-process.php
@@ -2,7 +2,7 @@
 /**
  * Order cleanup background process.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.4.0
  * @since   3.4.0
  */
diff --git a/includes/class-wc-product-attribute.php b/includes/class-wc-product-attribute.php
index 228dae1a319..14f1901c7aa 100644
--- a/includes/class-wc-product-attribute.php
+++ b/includes/class-wc-product-attribute.php
@@ -5,7 +5,7 @@
  * Attributes can be global (taxonomy based) or local to the product itself.
  * Uses ArrayAccess to be BW compatible with previous ways of reading attributes.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-product-download.php b/includes/class-wc-product-download.php
index 96711bc4807..1c13bf1b3b4 100644
--- a/includes/class-wc-product-download.php
+++ b/includes/class-wc-product-download.php
@@ -2,7 +2,7 @@
 /**
  * Represents a file which can be downloaded.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  * @since   3.0.0
  */
diff --git a/includes/class-wc-product-external.php b/includes/class-wc-product-external.php
index b99f10b90bc..f88d45fb5c6 100644
--- a/includes/class-wc-product-external.php
+++ b/includes/class-wc-product-external.php
@@ -4,7 +4,7 @@
  *
  * External products cannot be bought; they link offsite. Extends simple products.
  *
- * @package WooCommerce/Classes/Products
+ * @package WooCommerce\Classes\Products
  * @version 3.0.0
  */
 
diff --git a/includes/class-wc-product-factory.php b/includes/class-wc-product-factory.php
index 02bd8d1cd5a..9344f675310 100644
--- a/includes/class-wc-product-factory.php
+++ b/includes/class-wc-product-factory.php
@@ -4,7 +4,7 @@
  *
  * The WooCommerce product factory creating the right product object.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  */
 
diff --git a/includes/class-wc-product-query.php b/includes/class-wc-product-query.php
index 1de8bf210d5..8562a1fc1e9 100644
--- a/includes/class-wc-product-query.php
+++ b/includes/class-wc-product-query.php
@@ -4,7 +4,7 @@
  *
  * Args and usage: https://github.com/woocommerce/woocommerce/wiki/wc_get_products-and-WC_Product_Query
  *
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @version  3.2.0
  * @since    3.2.0
  */
diff --git a/includes/class-wc-product-simple.php b/includes/class-wc-product-simple.php
index 5a828ec0d17..6dfebfc5191 100644
--- a/includes/class-wc-product-simple.php
+++ b/includes/class-wc-product-simple.php
@@ -4,7 +4,7 @@
  *
  * The default product type kinda product.
  *
- * @package WooCommerce/Classes/Products
+ * @package WooCommerce\Classes\Products
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-product-variable.php b/includes/class-wc-product-variable.php
index 93c1c237724..135705e81d5 100644
--- a/includes/class-wc-product-variable.php
+++ b/includes/class-wc-product-variable.php
@@ -5,7 +5,7 @@
  * The WooCommerce product class handles individual product data.
  *
  * @version 3.0.0
- * @package WooCommerce/Classes/Products
+ * @package WooCommerce\Classes\Products
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-product-variation.php b/includes/class-wc-product-variation.php
index f574ba1fd01..2204f85d963 100644
--- a/includes/class-wc-product-variation.php
+++ b/includes/class-wc-product-variation.php
@@ -4,7 +4,7 @@
  *
  * The WooCommerce product variation class handles product variation data.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.0.0
  */
 
diff --git a/includes/class-wc-rate-limiter.php b/includes/class-wc-rate-limiter.php
index f50bd229b52..aba4fb01489 100644
--- a/includes/class-wc-rate-limiter.php
+++ b/includes/class-wc-rate-limiter.php
@@ -19,7 +19,7 @@
  *     add_notice( 'Sorry, too soon!' );
  * }
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.9.0
  * @since   3.9.0
  */
diff --git a/includes/class-wc-regenerate-images-request.php b/includes/class-wc-regenerate-images-request.php
index 0d0d90dbf33..0fc08a18c0f 100644
--- a/includes/class-wc-regenerate-images-request.php
+++ b/includes/class-wc-regenerate-images-request.php
@@ -2,7 +2,7 @@
 /**
  * All functionality to regenerate images in the background when settings change.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.3.0
  * @since   3.3.0
  */
diff --git a/includes/class-wc-regenerate-images.php b/includes/class-wc-regenerate-images.php
index a26590a1cb9..023deabfd83 100644
--- a/includes/class-wc-regenerate-images.php
+++ b/includes/class-wc-regenerate-images.php
@@ -4,7 +4,7 @@
  *
  * All functionality pertaining to regenerating product images in realtime.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.5.0
  * @since   3.3.0
  */
diff --git a/includes/class-wc-register-wp-admin-settings.php b/includes/class-wc-register-wp-admin-settings.php
index 822972f6985..9dbefe84b46 100644
--- a/includes/class-wc-register-wp-admin-settings.php
+++ b/includes/class-wc-register-wp-admin-settings.php
@@ -2,7 +2,7 @@
 /**
  * Take settings registered for WP-Admin and hooks them up to the REST API
  *
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @version  3.0.0
  * @since    3.0.0
  */
diff --git a/includes/class-wc-rest-authentication.php b/includes/class-wc-rest-authentication.php
index e58108f69d4..12014593ce7 100644
--- a/includes/class-wc-rest-authentication.php
+++ b/includes/class-wc-rest-authentication.php
@@ -2,7 +2,7 @@
 /**
  * REST API Authentication
  *
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.6.0
  */
 
diff --git a/includes/class-wc-rest-exception.php b/includes/class-wc-rest-exception.php
index 8d7fd704a08..d22a183ee45 100644
--- a/includes/class-wc-rest-exception.php
+++ b/includes/class-wc-rest-exception.php
@@ -4,7 +4,7 @@
  *
  * Extends Exception to provide additional data.
  *
- * @package WooCommerce/API
+ * @package WooCommerce\API
  * @since   2.6.0
  */
 
diff --git a/includes/class-wc-session-handler.php b/includes/class-wc-session-handler.php
index 689e61e083e..cacda9e59a2 100644
--- a/includes/class-wc-session-handler.php
+++ b/includes/class-wc-session-handler.php
@@ -7,7 +7,7 @@
  *
  * @class    WC_Session_Handler
  * @version  2.5.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/class-wc-shipping-rate.php b/includes/class-wc-shipping-rate.php
index 06dc919123c..1248a70a423 100644
--- a/includes/class-wc-shipping-rate.php
+++ b/includes/class-wc-shipping-rate.php
@@ -4,7 +4,7 @@
  *
  * Simple Class for storing rates.
  *
- * @package WooCommerce/Classes/Shipping
+ * @package WooCommerce\Classes\Shipping
  * @since   2.6.0
  */
 
diff --git a/includes/class-wc-shipping-zone.php b/includes/class-wc-shipping-zone.php
index 3accf0a1d74..c52b5cf79fe 100644
--- a/includes/class-wc-shipping-zone.php
+++ b/includes/class-wc-shipping-zone.php
@@ -4,7 +4,7 @@
  *
  * @since   2.6.0
  * @version 3.0.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-shipping-zones.php b/includes/class-wc-shipping-zones.php
index cb71dcd1abd..4acff8b8991 100644
--- a/includes/class-wc-shipping-zones.php
+++ b/includes/class-wc-shipping-zones.php
@@ -2,7 +2,7 @@
 /**
  * Handles storage and retrieval of shipping zones
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.3.0
  * @since   2.6.0
  */
diff --git a/includes/class-wc-shipping.php b/includes/class-wc-shipping.php
index a803c400f2f..91a9ab6a774 100644
--- a/includes/class-wc-shipping.php
+++ b/includes/class-wc-shipping.php
@@ -5,7 +5,7 @@
  * Handles shipping and loads shipping methods via hooks.
  *
  * @version 2.6.0
- * @package WooCommerce/Classes/Shipping
+ * @package WooCommerce\Classes\Shipping
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/class-wc-shortcodes.php b/includes/class-wc-shortcodes.php
index a26419ae89e..705b57d3e92 100644
--- a/includes/class-wc-shortcodes.php
+++ b/includes/class-wc-shortcodes.php
@@ -2,7 +2,7 @@
 /**
  * Shortcodes
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @version 3.2.0
  */
 
diff --git a/includes/class-wc-structured-data.php b/includes/class-wc-structured-data.php
index 3c2354c5a5b..070bea646b0 100644
--- a/includes/class-wc-structured-data.php
+++ b/includes/class-wc-structured-data.php
@@ -2,7 +2,7 @@
 /**
  * Structured data's handler and generator using JSON-LD format.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  * @since   3.0.0
  * @version 3.0.0
  */
diff --git a/includes/class-wc-tax.php b/includes/class-wc-tax.php
index a7784c3e702..70a34ab6c0c 100644
--- a/includes/class-wc-tax.php
+++ b/includes/class-wc-tax.php
@@ -2,7 +2,7 @@
 /**
  * Tax calculation and rate finding class.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-template-loader.php b/includes/class-wc-template-loader.php
index 28e0606f6b4..cfbda8c8b0f 100644
--- a/includes/class-wc-template-loader.php
+++ b/includes/class-wc-template-loader.php
@@ -2,7 +2,7 @@
 /**
  * Template Loader
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index 02f8a169a8b..ca197d87bbe 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -7,7 +7,7 @@
  *
  * @class WC_Tracker
  * @since 2.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/class-wc-webhook.php b/includes/class-wc-webhook.php
index c32f585cba4..b20766536fb 100644
--- a/includes/class-wc-webhook.php
+++ b/includes/class-wc-webhook.php
@@ -7,7 +7,7 @@
  * Webhooks are enqueued to their associated actions, delivered, and logged.
  *
  * @version  3.2.0
- * @package  WooCommerce/Webhooks
+ * @package  WooCommerce\Webhooks
  * @since    2.2.0
  */
 
diff --git a/includes/cli/class-wc-cli-rest-command.php b/includes/cli/class-wc-cli-rest-command.php
index 0e8eb2a81c9..56063f9e62c 100644
--- a/includes/cli/class-wc-cli-rest-command.php
+++ b/includes/cli/class-wc-cli-rest-command.php
@@ -2,7 +2,7 @@
 /**
  * WP_CLI_Rest_Command class file.
  *
- * @package WooCommerce\Cli
+ * @package WooCommerce\CLI
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/data-stores/abstract-wc-order-data-store-cpt.php b/includes/data-stores/abstract-wc-order-data-store-cpt.php
index 20b77b00797..fe8233e8bcf 100644
--- a/includes/data-stores/abstract-wc-order-data-store-cpt.php
+++ b/includes/data-stores/abstract-wc-order-data-store-cpt.php
@@ -2,7 +2,7 @@
 /**
  * Abstract_WC_Order_Data_Store_CPT class file.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/data-stores/class-wc-coupon-data-store-cpt.php b/includes/data-stores/class-wc-coupon-data-store-cpt.php
index 68f0c1671f5..da05e16f2a2 100644
--- a/includes/data-stores/class-wc-coupon-data-store-cpt.php
+++ b/includes/data-stores/class-wc-coupon-data-store-cpt.php
@@ -2,7 +2,7 @@
 /**
  * Class WC_Coupon_Data_Store_CPT file.
  *
- * @package WooCommerce\DataStore
+ * @package WooCommerce\DataStores
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/data-stores/class-wc-data-store-wp.php b/includes/data-stores/class-wc-data-store-wp.php
index fad8a1a3271..10222a73a27 100644
--- a/includes/data-stores/class-wc-data-store-wp.php
+++ b/includes/data-stores/class-wc-data-store-wp.php
@@ -6,7 +6,7 @@
  * your own meta handling functions.
  *
  * @version 3.0.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/data-stores/class-wc-order-data-store-cpt.php b/includes/data-stores/class-wc-order-data-store-cpt.php
index bc8c2961f0d..0e19ecd4370 100644
--- a/includes/data-stores/class-wc-order-data-store-cpt.php
+++ b/includes/data-stores/class-wc-order-data-store-cpt.php
@@ -2,7 +2,7 @@
 /**
  * WC_Order_Data_Store_CPT class file.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/data-stores/class-wc-product-data-store-cpt.php b/includes/data-stores/class-wc-product-data-store-cpt.php
index e417c1d9c6a..9e17fb52869 100644
--- a/includes/data-stores/class-wc-product-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-data-store-cpt.php
@@ -2,7 +2,7 @@
 /**
  * WC_Product_Data_Store_CPT class file.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/data-stores/class-wc-product-variable-data-store-cpt.php b/includes/data-stores/class-wc-product-variable-data-store-cpt.php
index dd2c2b16bbe..0f09da96679 100644
--- a/includes/data-stores/class-wc-product-variable-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-variable-data-store-cpt.php
@@ -2,7 +2,7 @@
 /**
  * File for WC Variable Product Data Store class.
  *
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/data-stores/class-wc-webhook-data-store.php b/includes/data-stores/class-wc-webhook-data-store.php
index a684981238b..947e89edb13 100644
--- a/includes/data-stores/class-wc-webhook-data-store.php
+++ b/includes/data-stores/class-wc-webhook-data-store.php
@@ -3,7 +3,7 @@
  * Webhook Data Store
  *
  * @version  3.3.0
- * @package  WooCommerce/Classes/Data_Store
+ * @package  WooCommerce\Classes\Data_Store
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/emails/class-wc-email-cancelled-order.php b/includes/emails/class-wc-email-cancelled-order.php
index d245a9d4f91..eeb4d34c73e 100644
--- a/includes/emails/class-wc-email-cancelled-order.php
+++ b/includes/emails/class-wc-email-cancelled-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
 	 *
 	 * @class       WC_Email_Cancelled_Order
 	 * @version     2.2.7
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Cancelled_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-completed-order.php b/includes/emails/class-wc-email-customer-completed-order.php
index 91c1fe884ca..17958670e8c 100644
--- a/includes/emails/class-wc-email-customer-completed-order.php
+++ b/includes/emails/class-wc-email-customer-completed-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_Completed_Order', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_Completed_Order
 	 * @version     2.0.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_Completed_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-invoice.php b/includes/emails/class-wc-email-customer-invoice.php
index a1973bfbc3e..0a2592cacf5 100644
--- a/includes/emails/class-wc-email-customer-invoice.php
+++ b/includes/emails/class-wc-email-customer-invoice.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_Invoice', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_Invoice
 	 * @version     3.5.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_Invoice extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-new-account.php b/includes/emails/class-wc-email-customer-new-account.php
index 674d18b3890..3cd0a825b58 100644
--- a/includes/emails/class-wc-email-customer-new-account.php
+++ b/includes/emails/class-wc-email-customer-new-account.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_New_Account', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_New_Account
 	 * @version     3.5.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_New_Account extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-note.php b/includes/emails/class-wc-email-customer-note.php
index 33e8aa6e8c1..cf1b2651901 100644
--- a/includes/emails/class-wc-email-customer-note.php
+++ b/includes/emails/class-wc-email-customer-note.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_Note', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_Note
 	 * @version     3.5.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_Note extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-on-hold-order.php b/includes/emails/class-wc-email-customer-on-hold-order.php
index 2985c40a0fc..080abb92395 100644
--- a/includes/emails/class-wc-email-customer-on-hold-order.php
+++ b/includes/emails/class-wc-email-customer-on-hold-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_On_Hold_Order', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_On_Hold_Order
 	 * @version     2.6.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_On_Hold_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-processing-order.php b/includes/emails/class-wc-email-customer-processing-order.php
index 42fc858c038..18b8c95ac51 100644
--- a/includes/emails/class-wc-email-customer-processing-order.php
+++ b/includes/emails/class-wc-email-customer-processing-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_Processing_Order
 	 * @version     3.5.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_Processing_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-refunded-order.php b/includes/emails/class-wc-email-customer-refunded-order.php
index c70373759d9..1536ba33131 100644
--- a/includes/emails/class-wc-email-customer-refunded-order.php
+++ b/includes/emails/class-wc-email-customer-refunded-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_Refunded_Order', false ) ) :
 	 *
 	 * @class    WC_Email_Customer_Refunded_Order
 	 * @version  3.5.0
-	 * @package  WooCommerce/Classes/Emails
+	 * @package  WooCommerce\Classes\Emails
 	 * @extends  WC_Email
 	 */
 	class WC_Email_Customer_Refunded_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email-customer-reset-password.php b/includes/emails/class-wc-email-customer-reset-password.php
index 9392e1f26fd..7603097e4de 100644
--- a/includes/emails/class-wc-email-customer-reset-password.php
+++ b/includes/emails/class-wc-email-customer-reset-password.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Customer_Reset_Password', false ) ) :
 	 *
 	 * @class       WC_Email_Customer_Reset_Password
 	 * @version     3.5.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Customer_Reset_Password extends WC_Email {
diff --git a/includes/emails/class-wc-email-failed-order.php b/includes/emails/class-wc-email-failed-order.php
index bf7c43fdf15..0766d9ac9b4 100644
--- a/includes/emails/class-wc-email-failed-order.php
+++ b/includes/emails/class-wc-email-failed-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_Failed_Order', false ) ) :
 	 *
 	 * @class       WC_Email_Failed_Order
 	 * @version     2.5.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_Failed_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email-new-order.php b/includes/emails/class-wc-email-new-order.php
index 159c6e45b30..0c063d61e76 100644
--- a/includes/emails/class-wc-email-new-order.php
+++ b/includes/emails/class-wc-email-new-order.php
@@ -18,7 +18,7 @@ if ( ! class_exists( 'WC_Email_New_Order' ) ) :
 	 *
 	 * @class       WC_Email_New_Order
 	 * @version     2.0.0
-	 * @package     WooCommerce/Classes/Emails
+	 * @package     WooCommerce\Classes\Emails
 	 * @extends     WC_Email
 	 */
 	class WC_Email_New_Order extends WC_Email {
diff --git a/includes/emails/class-wc-email.php b/includes/emails/class-wc-email.php
index a16abe1a252..a47736ff75f 100644
--- a/includes/emails/class-wc-email.php
+++ b/includes/emails/class-wc-email.php
@@ -20,7 +20,7 @@ if ( class_exists( 'WC_Email', false ) ) {
  *
  * @class       WC_Email
  * @version     2.5.0
- * @package     WooCommerce/Classes/Emails
+ * @package     WooCommerce\Classes\Emails
  * @extends     WC_Settings_API
  */
 class WC_Email extends WC_Settings_API {
diff --git a/includes/export/abstract-wc-csv-batch-exporter.php b/includes/export/abstract-wc-csv-batch-exporter.php
index 17e97aa7f53..b48fd53a4ae 100644
--- a/includes/export/abstract-wc-csv-batch-exporter.php
+++ b/includes/export/abstract-wc-csv-batch-exporter.php
@@ -4,7 +4,7 @@
  *
  * Based on https://pippinsplugins.com/batch-processing-for-big-data/
  *
- * @package  WooCommerce/Export
+ * @package  WooCommerce\Export
  * @version  3.1.0
  */
 
diff --git a/includes/export/abstract-wc-csv-exporter.php b/includes/export/abstract-wc-csv-exporter.php
index cda963538db..e5631b9a5a3 100644
--- a/includes/export/abstract-wc-csv-exporter.php
+++ b/includes/export/abstract-wc-csv-exporter.php
@@ -2,7 +2,7 @@
 /**
  * Handles CSV export.
  *
- * @package  WooCommerce/Export
+ * @package  WooCommerce\Export
  * @version  3.1.0
  */
 
diff --git a/includes/export/class-wc-product-csv-exporter.php b/includes/export/class-wc-product-csv-exporter.php
index 394353bd6e4..23264604176 100644
--- a/includes/export/class-wc-product-csv-exporter.php
+++ b/includes/export/class-wc-product-csv-exporter.php
@@ -2,7 +2,7 @@
 /**
  * Handles product CSV export.
  *
- * @package WooCommerce/Export
+ * @package WooCommerce\Export
  * @version 3.1.0
  */
 
diff --git a/includes/gateways/bacs/class-wc-gateway-bacs.php b/includes/gateways/bacs/class-wc-gateway-bacs.php
index 83f43639e01..3ec175dfd59 100644
--- a/includes/gateways/bacs/class-wc-gateway-bacs.php
+++ b/includes/gateways/bacs/class-wc-gateway-bacs.php
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class       WC_Gateway_BACS
  * @extends     WC_Payment_Gateway
  * @version     2.1.0
- * @package     WooCommerce/Classes/Payment
+ * @package     WooCommerce\Classes\Payment
  */
 class WC_Gateway_BACS extends WC_Payment_Gateway {
 
diff --git a/includes/gateways/cheque/class-wc-gateway-cheque.php b/includes/gateways/cheque/class-wc-gateway-cheque.php
index 40f2599438f..7f5d003b72e 100644
--- a/includes/gateways/cheque/class-wc-gateway-cheque.php
+++ b/includes/gateways/cheque/class-wc-gateway-cheque.php
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class       WC_Gateway_Cheque
  * @extends     WC_Payment_Gateway
  * @version     2.1.0
- * @package     WooCommerce/Classes/Payment
+ * @package     WooCommerce\Classes\Payment
  */
 class WC_Gateway_Cheque extends WC_Payment_Gateway {
 
diff --git a/includes/gateways/class-wc-payment-gateway-cc.php b/includes/gateways/class-wc-payment-gateway-cc.php
index 22fe83bee3f..0ddd4621697 100644
--- a/includes/gateways/class-wc-payment-gateway-cc.php
+++ b/includes/gateways/class-wc-payment-gateway-cc.php
@@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Credit Card Payment Gateway
  *
  * @since       2.6.0
- * @package     WooCommerce/Classes
+ * @package     WooCommerce\Classes
  */
 class WC_Payment_Gateway_CC extends WC_Payment_Gateway {
 
diff --git a/includes/gateways/class-wc-payment-gateway-echeck.php b/includes/gateways/class-wc-payment-gateway-echeck.php
index 69a564816df..c7754b664f9 100644
--- a/includes/gateways/class-wc-payment-gateway-echeck.php
+++ b/includes/gateways/class-wc-payment-gateway-echeck.php
@@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Class for eCheck Payment Gateway
  *
  * @since       2.6.0
- * @package     WooCommerce/Classes
+ * @package     WooCommerce\Classes
  */
 class WC_Payment_Gateway_ECheck extends WC_Payment_Gateway {
 
diff --git a/includes/gateways/cod/class-wc-gateway-cod.php b/includes/gateways/cod/class-wc-gateway-cod.php
index a77bbede872..33c17643bf0 100644
--- a/includes/gateways/cod/class-wc-gateway-cod.php
+++ b/includes/gateways/cod/class-wc-gateway-cod.php
@@ -19,7 +19,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class       WC_Gateway_COD
  * @extends     WC_Payment_Gateway
  * @version     2.1.0
- * @package     WooCommerce/Classes/Payment
+ * @package     WooCommerce\Classes\Payment
  */
 class WC_Gateway_COD extends WC_Payment_Gateway {
 
diff --git a/includes/gateways/paypal/class-wc-gateway-paypal.php b/includes/gateways/paypal/class-wc-gateway-paypal.php
index 03d7972e7bd..6cd1a03dd83 100644
--- a/includes/gateways/paypal/class-wc-gateway-paypal.php
+++ b/includes/gateways/paypal/class-wc-gateway-paypal.php
@@ -7,7 +7,7 @@
  * @class       WC_Gateway_Paypal
  * @extends     WC_Payment_Gateway
  * @version     2.3.0
- * @package     WooCommerce/Classes/Payment
+ * @package     WooCommerce\Classes\Payment
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php
index ca15f4a74d6..b98b8eee30b 100644
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-ipn-handler.php
@@ -2,7 +2,7 @@
 /**
  * Handles responses from PayPal IPN.
  *
- * @package WooCommerce/PayPal
+ * @package WooCommerce\PayPal
  * @version 3.3.0
  */
 
diff --git a/includes/gateways/paypal/includes/settings-paypal.php b/includes/gateways/paypal/includes/settings-paypal.php
index 00bad8a706e..199c56ea758 100644
--- a/includes/gateways/paypal/includes/settings-paypal.php
+++ b/includes/gateways/paypal/includes/settings-paypal.php
@@ -2,7 +2,7 @@
 /**
  * Settings for PayPal Gateway.
  *
- * @package WooCommerce/Classes/Payment
+ * @package WooCommerce\Classes\Payment
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/import/abstract-wc-product-importer.php b/includes/import/abstract-wc-product-importer.php
index 9cdd55af0f0..aa65051e0fe 100644
--- a/includes/import/abstract-wc-product-importer.php
+++ b/includes/import/abstract-wc-product-importer.php
@@ -2,7 +2,7 @@
 /**
  * Abstract Product importer
  *
- * @package  WooCommerce/Import
+ * @package  WooCommerce\Import
  * @version  3.1.0
  */
 
diff --git a/includes/import/class-wc-product-csv-importer.php b/includes/import/class-wc-product-csv-importer.php
index c361f95faea..c9c11f44684 100644
--- a/includes/import/class-wc-product-csv-importer.php
+++ b/includes/import/class-wc-product-csv-importer.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Product CSV importer
  *
- * @package WooCommerce/Import
+ * @package WooCommerce\Import
  * @version 3.1.0
  */
 
diff --git a/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-database-service.php b/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-database-service.php
index 0778276626e..8a78efb4fbb 100644
--- a/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-database-service.php
+++ b/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-database-service.php
@@ -3,7 +3,7 @@
  * The database service class file.
  *
  * @version 3.9.0
- * @package WooCommerce/Integrations
+ * @package WooCommerce\Integrations
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-geolocation.php b/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-geolocation.php
index 80a338ea2b8..1b84f3f06a9 100644
--- a/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-geolocation.php
+++ b/includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-geolocation.php
@@ -3,7 +3,7 @@
  * MaxMind Geolocation Integration
  *
  * @version 3.9.0
- * @package WooCommerce/Integrations
+ * @package WooCommerce\Integrations
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/interfaces/class-wc-abstract-order-data-store-interface.php b/includes/interfaces/class-wc-abstract-order-data-store-interface.php
index 5688361b918..c043c34e214 100644
--- a/includes/interfaces/class-wc-abstract-order-data-store-interface.php
+++ b/includes/interfaces/class-wc-abstract-order-data-store-interface.php
@@ -3,7 +3,7 @@
  * Order Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interfaces
+ * @package WooCommerce\Interfaces
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-coupon-data-store-interface.php b/includes/interfaces/class-wc-coupon-data-store-interface.php
index c97e2c2f6d2..95256bcc00d 100644
--- a/includes/interfaces/class-wc-coupon-data-store-interface.php
+++ b/includes/interfaces/class-wc-coupon-data-store-interface.php
@@ -3,7 +3,7 @@
  * Coupon Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interfaces
+ * @package WooCommerce\Interfaces
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-customer-data-store-interface.php b/includes/interfaces/class-wc-customer-data-store-interface.php
index b353fc3b0f2..d2601898516 100644
--- a/includes/interfaces/class-wc-customer-data-store-interface.php
+++ b/includes/interfaces/class-wc-customer-data-store-interface.php
@@ -3,7 +3,7 @@
  * Customer Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-customer-download-data-store-interface.php b/includes/interfaces/class-wc-customer-download-data-store-interface.php
index 4f9cb235aeb..4ef79c59395 100644
--- a/includes/interfaces/class-wc-customer-download-data-store-interface.php
+++ b/includes/interfaces/class-wc-customer-download-data-store-interface.php
@@ -3,7 +3,7 @@
  * Customer Download Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-customer-download-log-data-store-interface.php b/includes/interfaces/class-wc-customer-download-log-data-store-interface.php
index 06d9e1d5cf4..32c5b168c4f 100644
--- a/includes/interfaces/class-wc-customer-download-log-data-store-interface.php
+++ b/includes/interfaces/class-wc-customer-download-log-data-store-interface.php
@@ -3,7 +3,7 @@
  * Customer Download Log Data Store Interface
  *
  * @version 3.3.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-importer-interface.php b/includes/interfaces/class-wc-importer-interface.php
index fc6e3f9de48..fa4317932b8 100644
--- a/includes/interfaces/class-wc-importer-interface.php
+++ b/includes/interfaces/class-wc-importer-interface.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Importer Interface
  *
- * @package  WooCommerce/Interface
+ * @package  WooCommerce\Interface
  * @version  3.1.0
  */
 
diff --git a/includes/interfaces/class-wc-log-handler-interface.php b/includes/interfaces/class-wc-log-handler-interface.php
index c8b3dd8e455..d84e39720c8 100644
--- a/includes/interfaces/class-wc-log-handler-interface.php
+++ b/includes/interfaces/class-wc-log-handler-interface.php
@@ -3,7 +3,7 @@
  * Log Handler Interface
  *
  * @version 3.3.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-logger-interface.php b/includes/interfaces/class-wc-logger-interface.php
index 13194d19ccb..726b20cfe66 100644
--- a/includes/interfaces/class-wc-logger-interface.php
+++ b/includes/interfaces/class-wc-logger-interface.php
@@ -3,7 +3,7 @@
  * Logger Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-object-data-store-interface.php b/includes/interfaces/class-wc-object-data-store-interface.php
index 006873621ad..f6f276aaae6 100644
--- a/includes/interfaces/class-wc-object-data-store-interface.php
+++ b/includes/interfaces/class-wc-object-data-store-interface.php
@@ -3,7 +3,7 @@
  * Object Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-order-data-store-interface.php b/includes/interfaces/class-wc-order-data-store-interface.php
index 4727b9eb181..6f00c8a3efe 100644
--- a/includes/interfaces/class-wc-order-data-store-interface.php
+++ b/includes/interfaces/class-wc-order-data-store-interface.php
@@ -3,7 +3,7 @@
  * Order Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-order-item-data-store-interface.php b/includes/interfaces/class-wc-order-item-data-store-interface.php
index cbb13c27428..68ba29b4013 100644
--- a/includes/interfaces/class-wc-order-item-data-store-interface.php
+++ b/includes/interfaces/class-wc-order-item-data-store-interface.php
@@ -3,7 +3,7 @@
  * Order Item Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-order-item-product-data-store-interface.php b/includes/interfaces/class-wc-order-item-product-data-store-interface.php
index a6551ae0c1c..f5cd402ea2f 100644
--- a/includes/interfaces/class-wc-order-item-product-data-store-interface.php
+++ b/includes/interfaces/class-wc-order-item-product-data-store-interface.php
@@ -3,7 +3,7 @@
  * Order Item Product Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-order-item-type-data-store-interface.php b/includes/interfaces/class-wc-order-item-type-data-store-interface.php
index 548b4676fa7..006a4e6b0d4 100644
--- a/includes/interfaces/class-wc-order-item-type-data-store-interface.php
+++ b/includes/interfaces/class-wc-order-item-type-data-store-interface.php
@@ -3,7 +3,7 @@
  * Order Item Type Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-order-refund-data-store-interface.php b/includes/interfaces/class-wc-order-refund-data-store-interface.php
index 30961beef6c..b97864d06e3 100644
--- a/includes/interfaces/class-wc-order-refund-data-store-interface.php
+++ b/includes/interfaces/class-wc-order-refund-data-store-interface.php
@@ -3,7 +3,7 @@
  * Order Refund Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-payment-token-data-store-interface.php b/includes/interfaces/class-wc-payment-token-data-store-interface.php
index 3fdf0eacbef..fb2a581e741 100644
--- a/includes/interfaces/class-wc-payment-token-data-store-interface.php
+++ b/includes/interfaces/class-wc-payment-token-data-store-interface.php
@@ -3,7 +3,7 @@
  * Payment Token Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-product-data-store-interface.php b/includes/interfaces/class-wc-product-data-store-interface.php
index c4f92f5d597..3e50cfedf14 100644
--- a/includes/interfaces/class-wc-product-data-store-interface.php
+++ b/includes/interfaces/class-wc-product-data-store-interface.php
@@ -3,7 +3,7 @@
  * Product Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-product-variable-data-store-interface.php b/includes/interfaces/class-wc-product-variable-data-store-interface.php
index 3a62ac87a90..b22893dc3a6 100644
--- a/includes/interfaces/class-wc-product-variable-data-store-interface.php
+++ b/includes/interfaces/class-wc-product-variable-data-store-interface.php
@@ -3,7 +3,7 @@
  * Product Variable Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-queue-interface.php b/includes/interfaces/class-wc-queue-interface.php
index c341b6aff28..5a960d383f7 100644
--- a/includes/interfaces/class-wc-queue-interface.php
+++ b/includes/interfaces/class-wc-queue-interface.php
@@ -3,7 +3,7 @@
  * Queue Interface
  *
  * @version 3.5.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-shipping-zone-data-store-interface.php b/includes/interfaces/class-wc-shipping-zone-data-store-interface.php
index 830ca6cf5bd..7009c5b7209 100644
--- a/includes/interfaces/class-wc-shipping-zone-data-store-interface.php
+++ b/includes/interfaces/class-wc-shipping-zone-data-store-interface.php
@@ -3,7 +3,7 @@
  * Shipping Zone Data Store Interface
  *
  * @version 3.0.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/interfaces/class-wc-webhooks-data-store-interface.php b/includes/interfaces/class-wc-webhooks-data-store-interface.php
index 3d4839de9f0..f0e2e729843 100644
--- a/includes/interfaces/class-wc-webhooks-data-store-interface.php
+++ b/includes/interfaces/class-wc-webhooks-data-store-interface.php
@@ -3,7 +3,7 @@
  * Webhook Data Store Interface
  *
  * @version  3.2.0
- * @package  WooCommerce/Interface
+ * @package  WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/legacy/abstract-wc-legacy-order.php b/includes/legacy/abstract-wc-legacy-order.php
index ea7729f5833..8867096c739 100644
--- a/includes/legacy/abstract-wc-legacy-order.php
+++ b/includes/legacy/abstract-wc-legacy-order.php
@@ -10,7 +10,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * This class will be removed in future versions.
  *
  * @version	 3.0.0
- * @package	 WooCommerce/Abstracts
+ * @package	 WooCommerce\Abstracts
  * @category	Abstract Class
  * @author	  WooThemes
  */
diff --git a/includes/legacy/abstract-wc-legacy-payment-token.php b/includes/legacy/abstract-wc-legacy-payment-token.php
index d1316d1b4cd..ed7201a3038 100644
--- a/includes/legacy/abstract-wc-legacy-payment-token.php
+++ b/includes/legacy/abstract-wc-legacy-payment-token.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * directly on the object.
  *
  * @version  3.0.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @category Class
  * @author   WooCommerce
  */
diff --git a/includes/legacy/abstract-wc-legacy-product.php b/includes/legacy/abstract-wc-legacy-product.php
index 5e3464af08b..97f370e2ed1 100644
--- a/includes/legacy/abstract-wc-legacy-product.php
+++ b/includes/legacy/abstract-wc-legacy-product.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * This class will be removed in future versions.
  *
  * @version  3.0.0
- * @package  WooCommerce/Abstracts
+ * @package  WooCommerce\Abstracts
  * @category Abstract Class
  * @author   WooThemes
  */
diff --git a/includes/legacy/api/class-wc-rest-legacy-coupons-controller.php b/includes/legacy/api/class-wc-rest-legacy-coupons-controller.php
index 3378de41a40..19be8c3cb55 100644
--- a/includes/legacy/api/class-wc-rest-legacy-coupons-controller.php
+++ b/includes/legacy/api/class-wc-rest-legacy-coupons-controller.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    3.0.0
  */
 
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * REST API Legacy Coupons controller class.
  *
- * @package WooCommerce/API
+ * @package WooCommerce\API
  * @extends WC_REST_CRUD_Controller
  */
 class WC_REST_Legacy_Coupons_Controller extends WC_REST_CRUD_Controller {
diff --git a/includes/legacy/api/class-wc-rest-legacy-orders-controller.php b/includes/legacy/api/class-wc-rest-legacy-orders-controller.php
index ccc9db267f3..180e0299241 100644
--- a/includes/legacy/api/class-wc-rest-legacy-orders-controller.php
+++ b/includes/legacy/api/class-wc-rest-legacy-orders-controller.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    3.0.0
  */
 
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * REST API Legacy Orders controller class.
  *
- * @package WooCommerce/API
+ * @package WooCommerce\API
  * @extends WC_REST_CRUD_Controller
  */
 class WC_REST_Legacy_Orders_Controller extends WC_REST_CRUD_Controller {
diff --git a/includes/legacy/api/class-wc-rest-legacy-products-controller.php b/includes/legacy/api/class-wc-rest-legacy-products-controller.php
index 9096cbd0f98..b04ff689726 100644
--- a/includes/legacy/api/class-wc-rest-legacy-products-controller.php
+++ b/includes/legacy/api/class-wc-rest-legacy-products-controller.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    3.0.0
  */
 
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 /**
  * REST API Legacy Products controller class.
  *
- * @package WooCommerce/API
+ * @package WooCommerce\API
  * @extends WC_REST_CRUD_Controller
  */
 class WC_REST_Legacy_Products_Controller extends WC_REST_CRUD_Controller {
diff --git a/includes/legacy/api/v1/class-wc-api-authentication.php b/includes/legacy/api/v1/class-wc-api-authentication.php
index 1d26ae80ff6..a95abce7b8c 100644
--- a/includes/legacy/api/v1/class-wc-api-authentication.php
+++ b/includes/legacy/api/v1/class-wc-api-authentication.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.1.0
  * @version  2.4.0
  */
diff --git a/includes/legacy/api/v1/class-wc-api-coupons.php b/includes/legacy/api/v1/class-wc-api-coupons.php
index 244b5efd3b0..3f1a2b0428b 100644
--- a/includes/legacy/api/v1/class-wc-api-coupons.php
+++ b/includes/legacy/api/v1/class-wc-api-coupons.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-customers.php b/includes/legacy/api/v1/class-wc-api-customers.php
index d5edb1503a2..81752d8860d 100644
--- a/includes/legacy/api/v1/class-wc-api-customers.php
+++ b/includes/legacy/api/v1/class-wc-api-customers.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-json-handler.php b/includes/legacy/api/v1/class-wc-api-json-handler.php
index 691bbb9663c..df01283228d 100644
--- a/includes/legacy/api/v1/class-wc-api-json-handler.php
+++ b/includes/legacy/api/v1/class-wc-api-json-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-orders.php b/includes/legacy/api/v1/class-wc-api-orders.php
index c4a391d5bdb..e2fee006afb 100644
--- a/includes/legacy/api/v1/class-wc-api-orders.php
+++ b/includes/legacy/api/v1/class-wc-api-orders.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-products.php b/includes/legacy/api/v1/class-wc-api-products.php
index b608a3f326c..b81bc653cd1 100644
--- a/includes/legacy/api/v1/class-wc-api-products.php
+++ b/includes/legacy/api/v1/class-wc-api-products.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     3.0
  */
diff --git a/includes/legacy/api/v1/class-wc-api-reports.php b/includes/legacy/api/v1/class-wc-api-reports.php
index 527ea64bf94..f8b95db0bd7 100644
--- a/includes/legacy/api/v1/class-wc-api-reports.php
+++ b/includes/legacy/api/v1/class-wc-api-reports.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-resource.php b/includes/legacy/api/v1/class-wc-api-resource.php
index d419f8346e9..ae1bd956fd5 100644
--- a/includes/legacy/api/v1/class-wc-api-resource.php
+++ b/includes/legacy/api/v1/class-wc-api-resource.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-server.php b/includes/legacy/api/v1/class-wc-api-server.php
index 182d482b51f..15ba35f05e5 100644
--- a/includes/legacy/api/v1/class-wc-api-server.php
+++ b/includes/legacy/api/v1/class-wc-api-server.php
@@ -9,7 +9,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/class-wc-api-xml-handler.php b/includes/legacy/api/v1/class-wc-api-xml-handler.php
index 04f47e669e4..a9b5fc7d4ea 100644
--- a/includes/legacy/api/v1/class-wc-api-xml-handler.php
+++ b/includes/legacy/api/v1/class-wc-api-xml-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v1/interface-wc-api-handler.php b/includes/legacy/api/v1/interface-wc-api-handler.php
index 464d9cb73cb..334c204f241 100644
--- a/includes/legacy/api/v1/interface-wc-api-handler.php
+++ b/includes/legacy/api/v1/interface-wc-api-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     2.1
  */
diff --git a/includes/legacy/api/v2/class-wc-api-authentication.php b/includes/legacy/api/v2/class-wc-api-authentication.php
index 2c75a75b605..31ee951667d 100644
--- a/includes/legacy/api/v2/class-wc-api-authentication.php
+++ b/includes/legacy/api/v2/class-wc-api-authentication.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.1.0
  * @version  2.4.0
  */
diff --git a/includes/legacy/api/v2/class-wc-api-coupons.php b/includes/legacy/api/v2/class-wc-api-coupons.php
index ca57fb4670e..4a7b12ae0bf 100644
--- a/includes/legacy/api/v2/class-wc-api-coupons.php
+++ b/includes/legacy/api/v2/class-wc-api-coupons.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-customers.php b/includes/legacy/api/v2/class-wc-api-customers.php
index 4912be3b34e..03b18dde8d2 100644
--- a/includes/legacy/api/v2/class-wc-api-customers.php
+++ b/includes/legacy/api/v2/class-wc-api-customers.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.2
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-exception.php b/includes/legacy/api/v2/class-wc-api-exception.php
index 834ed04d6eb..986f56d5903 100644
--- a/includes/legacy/api/v2/class-wc-api-exception.php
+++ b/includes/legacy/api/v2/class-wc-api-exception.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.2
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-json-handler.php b/includes/legacy/api/v2/class-wc-api-json-handler.php
index 672aa8850c2..b86f2e41820 100644
--- a/includes/legacy/api/v2/class-wc-api-json-handler.php
+++ b/includes/legacy/api/v2/class-wc-api-json-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-orders.php b/includes/legacy/api/v2/class-wc-api-orders.php
index 67fc745d364..a935a44541f 100644
--- a/includes/legacy/api/v2/class-wc-api-orders.php
+++ b/includes/legacy/api/v2/class-wc-api-orders.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-products.php b/includes/legacy/api/v2/class-wc-api-products.php
index 0ceaf023a0c..d065f886572 100644
--- a/includes/legacy/api/v2/class-wc-api-products.php
+++ b/includes/legacy/api/v2/class-wc-api-products.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     3.0
  */
diff --git a/includes/legacy/api/v2/class-wc-api-reports.php b/includes/legacy/api/v2/class-wc-api-reports.php
index 8387a2e7b9b..aae6d5f822c 100644
--- a/includes/legacy/api/v2/class-wc-api-reports.php
+++ b/includes/legacy/api/v2/class-wc-api-reports.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-resource.php b/includes/legacy/api/v2/class-wc-api-resource.php
index cd2a9ecde6f..9475ad3a27b 100644
--- a/includes/legacy/api/v2/class-wc-api-resource.php
+++ b/includes/legacy/api/v2/class-wc-api-resource.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-server.php b/includes/legacy/api/v2/class-wc-api-server.php
index 4df7e3bfcb3..eefa415b626 100644
--- a/includes/legacy/api/v2/class-wc-api-server.php
+++ b/includes/legacy/api/v2/class-wc-api-server.php
@@ -9,7 +9,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.1
  */
 
diff --git a/includes/legacy/api/v2/class-wc-api-webhooks.php b/includes/legacy/api/v2/class-wc-api-webhooks.php
index 83121936eaf..a8395e9ab82 100644
--- a/includes/legacy/api/v2/class-wc-api-webhooks.php
+++ b/includes/legacy/api/v2/class-wc-api-webhooks.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.2
  */
 
diff --git a/includes/legacy/api/v2/interface-wc-api-handler.php b/includes/legacy/api/v2/interface-wc-api-handler.php
index 484f9f57f02..30fa3642b98 100644
--- a/includes/legacy/api/v2/interface-wc-api-handler.php
+++ b/includes/legacy/api/v2/interface-wc-api-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-authentication.php b/includes/legacy/api/v3/class-wc-api-authentication.php
index 88f0a711644..c57f74a9d11 100644
--- a/includes/legacy/api/v3/class-wc-api-authentication.php
+++ b/includes/legacy/api/v3/class-wc-api-authentication.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.1.0
  * @version  2.4.0
  */
diff --git a/includes/legacy/api/v3/class-wc-api-coupons.php b/includes/legacy/api/v3/class-wc-api-coupons.php
index 43c71cb817c..49dbc0d4677 100644
--- a/includes/legacy/api/v3/class-wc-api-coupons.php
+++ b/includes/legacy/api/v3/class-wc-api-coupons.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-customers.php b/includes/legacy/api/v3/class-wc-api-customers.php
index 8e6c5a13d0b..afb092726ad 100644
--- a/includes/legacy/api/v3/class-wc-api-customers.php
+++ b/includes/legacy/api/v3/class-wc-api-customers.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.2
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-exception.php b/includes/legacy/api/v3/class-wc-api-exception.php
index 834ed04d6eb..986f56d5903 100644
--- a/includes/legacy/api/v3/class-wc-api-exception.php
+++ b/includes/legacy/api/v3/class-wc-api-exception.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.2
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-json-handler.php b/includes/legacy/api/v3/class-wc-api-json-handler.php
index 672aa8850c2..b86f2e41820 100644
--- a/includes/legacy/api/v3/class-wc-api-json-handler.php
+++ b/includes/legacy/api/v3/class-wc-api-json-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-orders.php b/includes/legacy/api/v3/class-wc-api-orders.php
index aa2f69219f6..e2d682d461b 100644
--- a/includes/legacy/api/v3/class-wc-api-orders.php
+++ b/includes/legacy/api/v3/class-wc-api-orders.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-products.php b/includes/legacy/api/v3/class-wc-api-products.php
index 35b7c206644..c9720ec9039 100644
--- a/includes/legacy/api/v3/class-wc-api-products.php
+++ b/includes/legacy/api/v3/class-wc-api-products.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  * @version     3.0
  */
diff --git a/includes/legacy/api/v3/class-wc-api-reports.php b/includes/legacy/api/v3/class-wc-api-reports.php
index 552fd253fda..c4613a63916 100644
--- a/includes/legacy/api/v3/class-wc-api-reports.php
+++ b/includes/legacy/api/v3/class-wc-api-reports.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-resource.php b/includes/legacy/api/v3/class-wc-api-resource.php
index 4aface69c0c..e87e9e9268d 100644
--- a/includes/legacy/api/v3/class-wc-api-resource.php
+++ b/includes/legacy/api/v3/class-wc-api-resource.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-server.php b/includes/legacy/api/v3/class-wc-api-server.php
index 9c22f6ef6fa..fe218dcf6c8 100644
--- a/includes/legacy/api/v3/class-wc-api-server.php
+++ b/includes/legacy/api/v3/class-wc-api-server.php
@@ -9,7 +9,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.1
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-taxes.php b/includes/legacy/api/v3/class-wc-api-taxes.php
index 0ff45885226..fef17b98bb3 100644
--- a/includes/legacy/api/v3/class-wc-api-taxes.php
+++ b/includes/legacy/api/v3/class-wc-api-taxes.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.5.0
  */
 
diff --git a/includes/legacy/api/v3/class-wc-api-webhooks.php b/includes/legacy/api/v3/class-wc-api-webhooks.php
index 83121936eaf..a8395e9ab82 100644
--- a/includes/legacy/api/v3/class-wc-api-webhooks.php
+++ b/includes/legacy/api/v3/class-wc-api-webhooks.php
@@ -6,7 +6,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.2
  */
 
diff --git a/includes/legacy/api/v3/interface-wc-api-handler.php b/includes/legacy/api/v3/interface-wc-api-handler.php
index 484f9f57f02..30fa3642b98 100644
--- a/includes/legacy/api/v3/interface-wc-api-handler.php
+++ b/includes/legacy/api/v3/interface-wc-api-handler.php
@@ -6,7 +6,7 @@
  *
  * @author      WooThemes
  * @category    API
- * @package     WooCommerce/API
+ * @package     WooCommerce\API
  * @since       2.1
  */
 
diff --git a/includes/legacy/class-wc-legacy-api.php b/includes/legacy/class-wc-legacy-api.php
index 4bb14fa0b62..f121fff8c82 100644
--- a/includes/legacy/class-wc-legacy-api.php
+++ b/includes/legacy/class-wc-legacy-api.php
@@ -4,7 +4,7 @@
  *
  * @author   WooThemes
  * @category API
- * @package  WooCommerce/API
+ * @package  WooCommerce\API
  * @since    2.6
  */
 
diff --git a/includes/legacy/class-wc-legacy-cart.php b/includes/legacy/class-wc-legacy-cart.php
index 4a5b14e0518..94a65443a38 100644
--- a/includes/legacy/class-wc-legacy-cart.php
+++ b/includes/legacy/class-wc-legacy-cart.php
@@ -6,7 +6,7 @@
  * This class will be removed in future versions.
  *
  * @version  3.2.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @category Class
  * @author   Automattic
  */
diff --git a/includes/legacy/class-wc-legacy-coupon.php b/includes/legacy/class-wc-legacy-coupon.php
index cad0fc1fdb1..95b3be4a9b5 100644
--- a/includes/legacy/class-wc-legacy-coupon.php
+++ b/includes/legacy/class-wc-legacy-coupon.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class       WC_Legacy_Coupon
  * @version     3.0.0
- * @package     WooCommerce/Classes
+ * @package     WooCommerce\Classes
  * @category    Class
  * @author      WooThemes
  */
diff --git a/includes/legacy/class-wc-legacy-customer.php b/includes/legacy/class-wc-legacy-customer.php
index 5ad3d952afe..37ed5922ad9 100644
--- a/includes/legacy/class-wc-legacy-customer.php
+++ b/includes/legacy/class-wc-legacy-customer.php
@@ -7,7 +7,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Legacy Customer.
  *
  * @version  3.0.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @category Class
  * @author   WooThemes
  */
diff --git a/includes/legacy/class-wc-legacy-shipping-zone.php b/includes/legacy/class-wc-legacy-shipping-zone.php
index aa06337a36c..3c1c3a0d754 100644
--- a/includes/legacy/class-wc-legacy-shipping-zone.php
+++ b/includes/legacy/class-wc-legacy-shipping-zone.php
@@ -7,7 +7,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * Legacy Shipping Zone.
  *
  * @version  3.0.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @category Class
  * @author   WooThemes
  */
diff --git a/includes/legacy/class-wc-legacy-webhook.php b/includes/legacy/class-wc-legacy-webhook.php
index e18000eedff..d1e703477b1 100644
--- a/includes/legacy/class-wc-legacy-webhook.php
+++ b/includes/legacy/class-wc-legacy-webhook.php
@@ -6,7 +6,7 @@
  * This class will be removed in future versions.
  *
  * @version  3.2.0
- * @package  WooCommerce/Classes
+ * @package  WooCommerce\Classes
  * @category Class
  * @author   Automattic
  */
diff --git a/includes/log-handlers/class-wc-log-handler-db.php b/includes/log-handlers/class-wc-log-handler-db.php
index 77b4f929642..ef961334e23 100644
--- a/includes/log-handlers/class-wc-log-handler-db.php
+++ b/includes/log-handlers/class-wc-log-handler-db.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class          WC_Log_Handler_DB
  * @version        1.0.0
- * @package        WooCommerce/Classes/Log_Handlers
+ * @package        WooCommerce\Classes\Log_Handlers
  */
 class WC_Log_Handler_DB extends WC_Log_Handler {
 
diff --git a/includes/log-handlers/class-wc-log-handler-email.php b/includes/log-handlers/class-wc-log-handler-email.php
index 6e23005dbaa..d3d6a683c43 100644
--- a/includes/log-handlers/class-wc-log-handler-email.php
+++ b/includes/log-handlers/class-wc-log-handler-email.php
@@ -28,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class          WC_Log_Handler_Email
  * @version        1.0.0
- * @package        WooCommerce/Classes/Log_Handlers
+ * @package        WooCommerce\Classes\Log_Handlers
  */
 class WC_Log_Handler_Email extends WC_Log_Handler {
 
diff --git a/includes/log-handlers/class-wc-log-handler-file.php b/includes/log-handlers/class-wc-log-handler-file.php
index 136603d44d5..0fc59a36a2d 100644
--- a/includes/log-handlers/class-wc-log-handler-file.php
+++ b/includes/log-handlers/class-wc-log-handler-file.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class          WC_Log_Handler_File
  * @version        1.0.0
- * @package        WooCommerce/Classes/Log_Handlers
+ * @package        WooCommerce\Classes\Log_Handlers
  */
 class WC_Log_Handler_File extends WC_Log_Handler {
 
diff --git a/includes/payment-tokens/class-wc-payment-token-cc.php b/includes/payment-tokens/class-wc-payment-token-cc.php
index 32abf6c4e38..f658389846a 100644
--- a/includes/payment-tokens/class-wc-payment-token-cc.php
+++ b/includes/payment-tokens/class-wc-payment-token-cc.php
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class       WC_Payment_Token_CC
  * @version     3.0.0
  * @since       2.6.0
- * @package     WooCommerce/PaymentTokens
+ * @package     WooCommerce\PaymentTokens
  */
 class WC_Payment_Token_CC extends WC_Payment_Token {
 
diff --git a/includes/payment-tokens/class-wc-payment-token-echeck.php b/includes/payment-tokens/class-wc-payment-token-echeck.php
index edb3b0ecf31..4e1e21e7f7a 100644
--- a/includes/payment-tokens/class-wc-payment-token-echeck.php
+++ b/includes/payment-tokens/class-wc-payment-token-echeck.php
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @class       WC_Payment_Token_ECheck
  * @version     3.0.0
  * @since       2.6.0
- * @package     WooCommerce/PaymentTokens
+ * @package     WooCommerce\PaymentTokens
  */
 class WC_Payment_Token_ECheck extends WC_Payment_Token {
 
diff --git a/includes/queue/class-wc-action-queue.php b/includes/queue/class-wc-action-queue.php
index f0e3445f42e..702861f54d3 100644
--- a/includes/queue/class-wc-action-queue.php
+++ b/includes/queue/class-wc-action-queue.php
@@ -3,7 +3,7 @@
  * Action Queue
  *
  * @version 3.5.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/queue/class-wc-queue.php b/includes/queue/class-wc-queue.php
index e17bbb6b9f7..80dd4b67a95 100644
--- a/includes/queue/class-wc-queue.php
+++ b/includes/queue/class-wc-queue.php
@@ -3,7 +3,7 @@
  * WC Queue
  *
  * @version 3.5.0
- * @package WooCommerce/Interface
+ * @package WooCommerce\Interface
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php b/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
index c31f946d323..7e1a647afb3 100644
--- a/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
+++ b/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
@@ -3,7 +3,7 @@
  * Flat Rate Shipping Method.
  *
  * @version 2.6.0
- * @package WooCommerce/Classes/Shipping
+ * @package WooCommerce\Classes\Shipping
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/shipping/flat-rate/includes/settings-flat-rate.php b/includes/shipping/flat-rate/includes/settings-flat-rate.php
index 803c961aa76..b4609d6b89b 100644
--- a/includes/shipping/flat-rate/includes/settings-flat-rate.php
+++ b/includes/shipping/flat-rate/includes/settings-flat-rate.php
@@ -2,7 +2,7 @@
 /**
  * Settings for flat rate shipping.
  *
- * @package WooCommerce/Classes/Shipping
+ * @package WooCommerce\Classes\Shipping
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
index 18cbc76315c..9f45ef6cb80 100644
--- a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
+++ b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class   WC_Shipping_Free_Shipping
  * @version 2.6.0
- * @package WooCommerce/Classes/Shipping
+ * @package WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
 
diff --git a/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php b/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php
index c5d78a8c227..a0d47dcb8e1 100644
--- a/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php
+++ b/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @deprecated  2.6.0
  * @version     2.4.0
- * @package     WooCommerce/Classes/Shipping
+ * @package     WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Legacy_Flat_Rate extends WC_Shipping_Method {
 
diff --git a/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php b/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php
index 55c4ebde1fc..e8f3b054dd2 100644
--- a/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php
+++ b/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @deprecated  2.6.0
  * @version 2.4.0
- * @package WooCommerce/Classes/Shipping
+ * @package WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method {
 
diff --git a/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php b/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php
index 4bbc884ba8e..6ddc038c6d5 100644
--- a/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php
+++ b/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @deprecated  2.6.0
  * @version     2.4.0
- * @package     WooCommerce/Classes/Shipping
+ * @package     WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Legacy_International_Delivery extends WC_Shipping_Legacy_Flat_Rate {
 
diff --git a/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php b/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php
index a0d435e6b2e..4484b79ce6e 100644
--- a/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php
+++ b/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @deprecated  2.6.0
  * @version     2.3.0
- * @package     WooCommerce/Classes/Shipping
+ * @package     WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup {
 
diff --git a/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php b/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php
index 6730eb44786..dc0608e442e 100644
--- a/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php
+++ b/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @deprecated  2.6.0
  * @version     2.3.0
- * @package     WooCommerce/Classes/Shipping
+ * @package     WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Legacy_Local_Pickup extends WC_Shipping_Method {
 
diff --git a/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php b/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
index 1724dc6a877..a64c69951d0 100644
--- a/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
+++ b/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @class       WC_Shipping_Local_Pickup
  * @version     2.6.0
- * @package     WooCommerce/Classes/Shipping
+ * @package     WooCommerce\Classes\Shipping
  */
 class WC_Shipping_Local_Pickup extends WC_Shipping_Method {
 
diff --git a/includes/shortcodes/class-wc-shortcode-cart.php b/includes/shortcodes/class-wc-shortcode-cart.php
index 060a2ad3687..3784fb79b5d 100644
--- a/includes/shortcodes/class-wc-shortcode-cart.php
+++ b/includes/shortcodes/class-wc-shortcode-cart.php
@@ -4,7 +4,7 @@
  *
  * Used on the cart page, the cart shortcode displays the cart contents and interface for coupon codes and other cart bits and pieces.
  *
- * @package WooCommerce/Shortcodes/Cart
+ * @package WooCommerce\Shortcodes\Cart
  * @version 2.3.0
  */
 
diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php
index 31413213a72..4f6450e63d6 100644
--- a/includes/shortcodes/class-wc-shortcode-checkout.php
+++ b/includes/shortcodes/class-wc-shortcode-checkout.php
@@ -4,7 +4,7 @@
  *
  * Used on the checkout page, the checkout shortcode displays the checkout process.
  *
- * @package WooCommerce/Shortcodes/Checkout
+ * @package WooCommerce\Shortcodes\Checkout
  * @version 2.0.0
  */
 
diff --git a/includes/shortcodes/class-wc-shortcode-my-account.php b/includes/shortcodes/class-wc-shortcode-my-account.php
index e3906c5371c..c01aaa36356 100644
--- a/includes/shortcodes/class-wc-shortcode-my-account.php
+++ b/includes/shortcodes/class-wc-shortcode-my-account.php
@@ -4,7 +4,7 @@
  *
  * Shows the 'my account' section where the customer can view past orders and update their information.
  *
- * @package WooCommerce/Shortcodes/My_Account
+ * @package WooCommerce\Shortcodes\My_Account
  * @version 2.0.0
  */
 
diff --git a/includes/shortcodes/class-wc-shortcode-order-tracking.php b/includes/shortcodes/class-wc-shortcode-order-tracking.php
index f9736c08ced..6798539ae82 100644
--- a/includes/shortcodes/class-wc-shortcode-order-tracking.php
+++ b/includes/shortcodes/class-wc-shortcode-order-tracking.php
@@ -4,7 +4,7 @@
  *
  * Lets a user see the status of an order by entering their order details.
  *
- * @package WooCommerce/Shortcodes/Order_Tracking
+ * @package WooCommerce\Shortcodes\Order_Tracking
  * @version 3.0.0
  */
 
diff --git a/includes/shortcodes/class-wc-shortcode-products.php b/includes/shortcodes/class-wc-shortcode-products.php
index b195676a607..9410efa65af 100644
--- a/includes/shortcodes/class-wc-shortcode-products.php
+++ b/includes/shortcodes/class-wc-shortcode-products.php
@@ -2,7 +2,7 @@
 /**
  * Products shortcode
  *
- * @package  WooCommerce/Shortcodes
+ * @package  WooCommerce\Shortcodes
  * @version  3.2.4
  */
 
diff --git a/includes/theme-support/class-wc-twenty-eleven.php b/includes/theme-support/class-wc-twenty-eleven.php
index a0b8391ef9b..fb06a7a84dc 100644
--- a/includes/theme-support/class-wc-twenty-eleven.php
+++ b/includes/theme-support/class-wc-twenty-eleven.php
@@ -3,7 +3,7 @@
  * Twenty Eleven support.
  *
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-fifteen.php b/includes/theme-support/class-wc-twenty-fifteen.php
index ece231ea996..83e1930cf93 100644
--- a/includes/theme-support/class-wc-twenty-fifteen.php
+++ b/includes/theme-support/class-wc-twenty-fifteen.php
@@ -4,7 +4,7 @@
  *
  * @class   WC_Twenty_Fifteen
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-fourteen.php b/includes/theme-support/class-wc-twenty-fourteen.php
index 1cef95456f8..ce04395299d 100644
--- a/includes/theme-support/class-wc-twenty-fourteen.php
+++ b/includes/theme-support/class-wc-twenty-fourteen.php
@@ -4,7 +4,7 @@
  *
  * @class   WC_Twenty_Fourteen
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-nineteen.php b/includes/theme-support/class-wc-twenty-nineteen.php
index a0bcf9f443e..47c1aff660c 100644
--- a/includes/theme-support/class-wc-twenty-nineteen.php
+++ b/includes/theme-support/class-wc-twenty-nineteen.php
@@ -3,7 +3,7 @@
  * Twenty Nineteen support.
  *
  * @since   3.5.X
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/theme-support/class-wc-twenty-seventeen.php b/includes/theme-support/class-wc-twenty-seventeen.php
index cca349a2175..2093d2200e7 100644
--- a/includes/theme-support/class-wc-twenty-seventeen.php
+++ b/includes/theme-support/class-wc-twenty-seventeen.php
@@ -3,7 +3,7 @@
  * Twenty Seventeen support.
  *
  * @since   2.6.9
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/theme-support/class-wc-twenty-sixteen.php b/includes/theme-support/class-wc-twenty-sixteen.php
index 831d65e97fe..c9681fa5e98 100644
--- a/includes/theme-support/class-wc-twenty-sixteen.php
+++ b/includes/theme-support/class-wc-twenty-sixteen.php
@@ -3,7 +3,7 @@
  * Twenty Sixteen support.
  *
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-ten.php b/includes/theme-support/class-wc-twenty-ten.php
index feac6e8036e..8a9262e6191 100644
--- a/includes/theme-support/class-wc-twenty-ten.php
+++ b/includes/theme-support/class-wc-twenty-ten.php
@@ -3,7 +3,7 @@
  * Twenty Ten support.
  *
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-thirteen.php b/includes/theme-support/class-wc-twenty-thirteen.php
index de4912f8c80..4e80b3e27c6 100644
--- a/includes/theme-support/class-wc-twenty-thirteen.php
+++ b/includes/theme-support/class-wc-twenty-thirteen.php
@@ -4,7 +4,7 @@
  *
  * @class   WC_Twenty_Thirteen
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-twelve.php b/includes/theme-support/class-wc-twenty-twelve.php
index 4eec7997c98..116dabea432 100644
--- a/includes/theme-support/class-wc-twenty-twelve.php
+++ b/includes/theme-support/class-wc-twenty-twelve.php
@@ -4,7 +4,7 @@
  *
  * @class   WC_Twenty_Twelve
  * @since   3.3.0
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/includes/theme-support/class-wc-twenty-twenty.php b/includes/theme-support/class-wc-twenty-twenty.php
index 35bf512b205..47296f639ab 100644
--- a/includes/theme-support/class-wc-twenty-twenty.php
+++ b/includes/theme-support/class-wc-twenty-twenty.php
@@ -3,7 +3,7 @@
  * Twenty Twenty support.
  *
  * @since   3.8.1
- * @package WooCommerce/Classes
+ * @package WooCommerce\Classes
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/includes/traits/trait-wc-item-totals.php b/includes/traits/trait-wc-item-totals.php
index 39e358807f5..d64d3215b7f 100644
--- a/includes/traits/trait-wc-item-totals.php
+++ b/includes/traits/trait-wc-item-totals.php
@@ -2,7 +2,7 @@
 /**
  * This ongoing trait will have shared calculation logic between WC_Abstract_Order and WC_Cart_Totals classes.
  *
- * @package WooCommerce/Traits
+ * @package WooCommerce\Traits
  * @version 3.9.0
  */
 
diff --git a/includes/walkers/class-product-cat-dropdown-walker.php b/includes/walkers/class-product-cat-dropdown-walker.php
index 90ff3c7cf60..fb4163fe934 100644
--- a/includes/walkers/class-product-cat-dropdown-walker.php
+++ b/includes/walkers/class-product-cat-dropdown-walker.php
@@ -2,7 +2,7 @@
 /**
  * Legacy WC_Product_Cat_Dropdown_Walker file
  *
- * @package WooCommerce/Classes/Walkers
+ * @package WooCommerce\Classes\Walkers
  * @deprecated 3.4.0
  */
 
diff --git a/includes/walkers/class-product-cat-list-walker.php b/includes/walkers/class-product-cat-list-walker.php
index 63a172e9341..9eca89ac0ac 100644
--- a/includes/walkers/class-product-cat-list-walker.php
+++ b/includes/walkers/class-product-cat-list-walker.php
@@ -2,7 +2,7 @@
 /**
  * Legacy WC_Product_Cat_List_Walker file
  *
- * @package WooCommerce/Classes/Walkers
+ * @package WooCommerce\Classes\Walkers
  * @deprecated 3.4.0
  */
 
diff --git a/includes/walkers/class-wc-product-cat-dropdown-walker.php b/includes/walkers/class-wc-product-cat-dropdown-walker.php
index 34250efcfb1..4b64298bf54 100644
--- a/includes/walkers/class-wc-product-cat-dropdown-walker.php
+++ b/includes/walkers/class-wc-product-cat-dropdown-walker.php
@@ -2,7 +2,7 @@
 /**
  * WC_Product_Cat_Dropdown_Walker class
  *
- * @package WooCommerce/Classes/Walkers
+ * @package WooCommerce\Classes\Walkers
  * @version 3.4.0
  */
 
diff --git a/includes/walkers/class-wc-product-cat-list-walker.php b/includes/walkers/class-wc-product-cat-list-walker.php
index 28b1785f163..cdd1fbba5d8 100644
--- a/includes/walkers/class-wc-product-cat-list-walker.php
+++ b/includes/walkers/class-wc-product-cat-list-walker.php
@@ -2,7 +2,7 @@
 /**
  * WC_Product_Cat_List_Walker class
  *
- * @package WooCommerce/Classes/Walkers
+ * @package WooCommerce\Classes\Walkers
  * @version 3.4.0
  */
 
diff --git a/includes/wc-account-functions.php b/includes/wc-account-functions.php
index 840990d1d43..2d67cad27b4 100644
--- a/includes/wc-account-functions.php
+++ b/includes/wc-account-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for account specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.6.0
  */
 
diff --git a/includes/wc-attribute-functions.php b/includes/wc-attribute-functions.php
index 658cb2284a3..535a719f1b8 100644
--- a/includes/wc-attribute-functions.php
+++ b/includes/wc-attribute-functions.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Attribute Functions
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.1.0
  */
 
diff --git a/includes/wc-cart-functions.php b/includes/wc-cart-functions.php
index b9f05304c04..e5ee3067ec9 100644
--- a/includes/wc-cart-functions.php
+++ b/includes/wc-cart-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for cart specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.5.0
  */
 
diff --git a/includes/wc-conditional-functions.php b/includes/wc-conditional-functions.php
index 53bc24b4f30..641066cb657 100644
--- a/includes/wc-conditional-functions.php
+++ b/includes/wc-conditional-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for determining the current query/page.
  *
- * @package     WooCommerce/Functions
+ * @package     WooCommerce\Functions
  * @version     2.3.0
  */
 
diff --git a/includes/wc-coupon-functions.php b/includes/wc-coupon-functions.php
index 13fd7c0f9e3..c3f96c2700c 100644
--- a/includes/wc-coupon-functions.php
+++ b/includes/wc-coupon-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for coupon specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.0.0
  */
 
diff --git a/includes/wc-formatting-functions.php b/includes/wc-formatting-functions.php
index 8a189d9cf5f..62ad3f1e105 100644
--- a/includes/wc-formatting-functions.php
+++ b/includes/wc-formatting-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for formatting data.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.1.0
  */
 
diff --git a/includes/wc-notice-functions.php b/includes/wc-notice-functions.php
index 1d417955d48..d1f05e0593b 100644
--- a/includes/wc-notice-functions.php
+++ b/includes/wc-notice-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for error/message handling and display.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.1.0
  */
 
diff --git a/includes/wc-order-functions.php b/includes/wc-order-functions.php
index 21839880bbd..5deef2b08d1 100644
--- a/includes/wc-order-functions.php
+++ b/includes/wc-order-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for order specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.4.0
  */
 
diff --git a/includes/wc-order-item-functions.php b/includes/wc-order-item-functions.php
index 825a22ac454..5f7c6a1f942 100644
--- a/includes/wc-order-item-functions.php
+++ b/includes/wc-order-item-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for order specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.4.0
  */
 
diff --git a/includes/wc-product-functions.php b/includes/wc-product-functions.php
index e7ee0359e46..7edeef07136 100644
--- a/includes/wc-product-functions.php
+++ b/includes/wc-product-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for product specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.0.0
  */
 
diff --git a/includes/wc-rest-functions.php b/includes/wc-rest-functions.php
index 065b079ed3f..54029b4074e 100644
--- a/includes/wc-rest-functions.php
+++ b/includes/wc-rest-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for REST specific things.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.6.0
  */
 
diff --git a/includes/wc-stock-functions.php b/includes/wc-stock-functions.php
index 32087998778..ccac0eac374 100644
--- a/includes/wc-stock-functions.php
+++ b/includes/wc-stock-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions used to manage product stock levels.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.4.0
  */
 
diff --git a/includes/wc-template-hooks.php b/includes/wc-template-hooks.php
index f45ea6a2d49..cc0b5189f24 100644
--- a/includes/wc-template-hooks.php
+++ b/includes/wc-template-hooks.php
@@ -4,7 +4,7 @@
  *
  * Action/filter hooks used for WooCommerce functions/templates.
  *
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.1.0
  */
 
diff --git a/includes/wc-term-functions.php b/includes/wc-term-functions.php
index 9d5032d8f5f..f40a89fb6b8 100644
--- a/includes/wc-term-functions.php
+++ b/includes/wc-term-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for handling terms/term meta.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.1.0
  */
 
diff --git a/includes/wc-update-functions.php b/includes/wc-update-functions.php
index f6f9788925d..2ebb79abdac 100644
--- a/includes/wc-update-functions.php
+++ b/includes/wc-update-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for updating data, used by the background updater.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.3.0
  */
 
diff --git a/includes/wc-user-functions.php b/includes/wc-user-functions.php
index 5d49e84ae37..282582cf624 100644
--- a/includes/wc-user-functions.php
+++ b/includes/wc-user-functions.php
@@ -4,7 +4,7 @@
  *
  * Functions for customers.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.2.0
  */
 
diff --git a/includes/wc-webhook-functions.php b/includes/wc-webhook-functions.php
index b5205c6607b..bc1d15998eb 100644
--- a/includes/wc-webhook-functions.php
+++ b/includes/wc-webhook-functions.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce Webhook functions
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 3.3.0
  */
 
diff --git a/includes/wc-widget-functions.php b/includes/wc-widget-functions.php
index 2972680371f..49da8f74a93 100644
--- a/includes/wc-widget-functions.php
+++ b/includes/wc-widget-functions.php
@@ -4,7 +4,7 @@
  *
  * Widget related functions and widget registration.
  *
- * @package WooCommerce/Functions
+ * @package WooCommerce\Functions
  * @version 2.3.0
  */
 
diff --git a/includes/wccom-site/class-wc-wccom-site-installer-requirements-check.php b/includes/wccom-site/class-wc-wccom-site-installer-requirements-check.php
index 8e54f3665ba..bfb300d83f1 100644
--- a/includes/wccom-site/class-wc-wccom-site-installer-requirements-check.php
+++ b/includes/wccom-site/class-wc-wccom-site-installer-requirements-check.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce.com Product Installation Requirements Check.
  *
- * @package WooCommerce\WooCommerce_Site
+ * @package WooCommerce\WCCom
  * @since   3.8.0
  */
 
diff --git a/includes/wccom-site/class-wc-wccom-site-installer.php b/includes/wccom-site/class-wc-wccom-site-installer.php
index efe4c48c05b..e066141f129 100644
--- a/includes/wccom-site/class-wc-wccom-site-installer.php
+++ b/includes/wccom-site/class-wc-wccom-site-installer.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce.com Product Installation.
  *
- * @package WooCommerce\WooCommerce_Site
+ * @package WooCommerce\WCCom
  * @since   3.7.0
  */
 
diff --git a/includes/wccom-site/class-wc-wccom-site.php b/includes/wccom-site/class-wc-wccom-site.php
index d710578a095..d09cb06982b 100644
--- a/includes/wccom-site/class-wc-wccom-site.php
+++ b/includes/wccom-site/class-wc-wccom-site.php
@@ -2,7 +2,7 @@
 /**
  * WooCommerce.com Product Installation.
  *
- * @package WooCommerce\WooCommerce_Site
+ * @package WooCommerce\WCCom
  * @since   3.7.0
  */
 
diff --git a/includes/wccom-site/rest-api/class-wc-rest-wccom-site-installer-errors.php b/includes/wccom-site/rest-api/class-wc-rest-wccom-site-installer-errors.php
index 0fb46ded4a8..366b9d071b0 100644
--- a/includes/wccom-site/rest-api/class-wc-rest-wccom-site-installer-errors.php
+++ b/includes/wccom-site/rest-api/class-wc-rest-wccom-site-installer-errors.php
@@ -2,7 +2,7 @@
 /**
  * WCCOM Site Installer Errors Class
  *
- * @package WooCommerce\WooCommerce_Site\Rest_Api
+ * @package WooCommerce\WCCom\API
  * @since   3.9.0
  */
 
diff --git a/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-installer-controller.php b/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-installer-controller.php
index d4f5dda0b0b..03daf78cc82 100644
--- a/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-installer-controller.php
+++ b/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-installer-controller.php
@@ -4,7 +4,7 @@
  *
  * Handles requests to /installer.
  *
- * @package WooCommerce\WooCommerce_Site\Rest_Api
+ * @package WooCommerce\WCCom\API
  * @since   3.7.0
  */
 
@@ -13,7 +13,6 @@ defined( 'ABSPATH' ) || exit;
 /**
  * REST API WCCOM Site Installer Controller Class.
  *
- * @package WooCommerce/WCCOM_Site/REST_API
  * @extends WC_REST_Controller
  */
 class WC_REST_WCCOM_Site_Installer_Controller extends WC_REST_Controller {
diff --git a/includes/widgets/class-wc-widget-cart.php b/includes/widgets/class-wc-widget-cart.php
index 0f4cb8a2a31..cc76280b5a7 100644
--- a/includes/widgets/class-wc-widget-cart.php
+++ b/includes/widgets/class-wc-widget-cart.php
@@ -4,7 +4,7 @@
  *
  * Displays shopping cart widget.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-layered-nav-filters.php b/includes/widgets/class-wc-widget-layered-nav-filters.php
index 68ebfd4a320..a333081c097 100644
--- a/includes/widgets/class-wc-widget-layered-nav-filters.php
+++ b/includes/widgets/class-wc-widget-layered-nav-filters.php
@@ -2,7 +2,7 @@
 /**
  * Layered Navigation Filters Widget.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-layered-nav.php b/includes/widgets/class-wc-widget-layered-nav.php
index ea8e65c6265..8a8dbbab11e 100644
--- a/includes/widgets/class-wc-widget-layered-nav.php
+++ b/includes/widgets/class-wc-widget-layered-nav.php
@@ -2,7 +2,7 @@
 /**
  * Layered nav widget
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.6.0
  */
 
diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php
index a27bbf1b048..cd8c5907ce8 100644
--- a/includes/widgets/class-wc-widget-price-filter.php
+++ b/includes/widgets/class-wc-widget-price-filter.php
@@ -4,7 +4,7 @@
  *
  * Generates a range slider to filter products by price.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-product-categories.php b/includes/widgets/class-wc-widget-product-categories.php
index 5025968523c..26b590bcdf7 100644
--- a/includes/widgets/class-wc-widget-product-categories.php
+++ b/includes/widgets/class-wc-widget-product-categories.php
@@ -2,7 +2,7 @@
 /**
  * Product Categories Widget
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-product-search.php b/includes/widgets/class-wc-widget-product-search.php
index 2df11926494..c27debbeb83 100644
--- a/includes/widgets/class-wc-widget-product-search.php
+++ b/includes/widgets/class-wc-widget-product-search.php
@@ -2,7 +2,7 @@
 /**
  * Product Search Widget.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-product-tag-cloud.php b/includes/widgets/class-wc-widget-product-tag-cloud.php
index c6f04988374..4d85bc0e45d 100644
--- a/includes/widgets/class-wc-widget-product-tag-cloud.php
+++ b/includes/widgets/class-wc-widget-product-tag-cloud.php
@@ -2,7 +2,7 @@
 /**
  * Tag Cloud Widget.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 3.4.0
  */
 
diff --git a/includes/widgets/class-wc-widget-products.php b/includes/widgets/class-wc-widget-products.php
index d9242f299ac..be373488920 100644
--- a/includes/widgets/class-wc-widget-products.php
+++ b/includes/widgets/class-wc-widget-products.php
@@ -2,7 +2,7 @@
 /**
  * List products. One widget to rule them all.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 3.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-rating-filter.php b/includes/widgets/class-wc-widget-rating-filter.php
index 9570f90deb5..669038860b1 100644
--- a/includes/widgets/class-wc-widget-rating-filter.php
+++ b/includes/widgets/class-wc-widget-rating-filter.php
@@ -2,7 +2,7 @@
 /**
  * Rating Filter Widget and related functions.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.6.0
  */
 
diff --git a/includes/widgets/class-wc-widget-recent-reviews.php b/includes/widgets/class-wc-widget-recent-reviews.php
index da2934400d1..635e26975b6 100644
--- a/includes/widgets/class-wc-widget-recent-reviews.php
+++ b/includes/widgets/class-wc-widget-recent-reviews.php
@@ -2,7 +2,7 @@
 /**
  * Recent Reviews Widget.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 2.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-recently-viewed.php b/includes/widgets/class-wc-widget-recently-viewed.php
index b721110f3be..e023927f6aa 100644
--- a/includes/widgets/class-wc-widget-recently-viewed.php
+++ b/includes/widgets/class-wc-widget-recently-viewed.php
@@ -2,7 +2,7 @@
 /**
  * Recent Products Widget.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 3.3.0
  */
 
diff --git a/includes/widgets/class-wc-widget-top-rated-products.php b/includes/widgets/class-wc-widget-top-rated-products.php
index 8af6b332dad..a5241ece94c 100644
--- a/includes/widgets/class-wc-widget-top-rated-products.php
+++ b/includes/widgets/class-wc-widget-top-rated-products.php
@@ -3,7 +3,7 @@
  * Top Rated Products Widget.
  * Gets and displays top rated products in an unordered list.
  *
- * @package WooCommerce/Widgets
+ * @package WooCommerce\Widgets
  * @version 3.3.0
  */
 
diff --git a/phpcs.xml b/phpcs.xml
index 5e17b62b39f..22b22d103c9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -73,6 +73,15 @@
 		<exclude-pattern>tests/Tools/</exclude-pattern>
 	</rule>
 
+	<rule ref="Squiz.Commenting.FileComment.MissingPackageTag">
+		<exclude-pattern>src/</exclude-pattern>
+		<exclude-pattern>tests/php/</exclude-pattern>
+	</rule>
+	<rule ref="Squiz.Commenting.FileComment.Missing">
+		<exclude-pattern>src/</exclude-pattern>
+		<exclude-pattern>tests/php/</exclude-pattern>
+	</rule>
+
 	<rule ref="Squiz.Commenting.FunctionCommentThrowTag.Missing">
 		<exclude-pattern>tests/php/</exclude-pattern>
 	</rule>
@@ -80,7 +89,7 @@
 	<rule ref="Squiz.Commenting.FileComment.Missing">
 		<exclude-pattern>tests/php/</exclude-pattern>
 	</rule>
-	
+
 	<rule ref="WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid">
 		<exclude-pattern>src/</exclude-pattern>
 	</rule>
diff --git a/src/Autoloader.php b/src/Autoloader.php
index f2da75ee72b..53f802e31fb 100644
--- a/src/Autoloader.php
+++ b/src/Autoloader.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Includes the composer Autoloader used for packages and classes in the src/ directory.
- *
- * @package Automattic/WooCommerce
  */
 
 namespace Automattic\WooCommerce;
diff --git a/src/Checkout/Helpers/ReserveStock.php b/src/Checkout/Helpers/ReserveStock.php
index 17220325c59..b17087e4688 100644
--- a/src/Checkout/Helpers/ReserveStock.php
+++ b/src/Checkout/Helpers/ReserveStock.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Handle product stock reservation during checkout.
- *
- * @package Automattic/WooCommerce
  */
 
 namespace Automattic\WooCommerce\Checkout\Helpers;
diff --git a/src/Checkout/Helpers/ReserveStockException.php b/src/Checkout/Helpers/ReserveStockException.php
index e84409b5f1d..0122ff96ec0 100644
--- a/src/Checkout/Helpers/ReserveStockException.php
+++ b/src/Checkout/Helpers/ReserveStockException.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Exceptions for stock reservation.
- *
- * @package Automattic/WooCommerce
  */
 
 namespace Automattic\WooCommerce\Checkout\Helpers;
diff --git a/src/Container.php b/src/Container.php
index faae3e8a672..c9b0bc777d5 100644
--- a/src/Container.php
+++ b/src/Container.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Container class file.
- *
- * @package Automattic\WooCommerce
  */
 
 namespace Automattic\WooCommerce;
diff --git a/src/Internal/DependencyManagement/AbstractServiceProvider.php b/src/Internal/DependencyManagement/AbstractServiceProvider.php
index 6f9e3537535..f7d811d6aa1 100644
--- a/src/Internal/DependencyManagement/AbstractServiceProvider.php
+++ b/src/Internal/DependencyManagement/AbstractServiceProvider.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * AbstractServiceProvider class file.
- *
- * @package Automattic\WooCommerce\Internal\DependencyManagement
  */
 
 namespace Automattic\WooCommerce\Internal\DependencyManagement;
diff --git a/src/Internal/DependencyManagement/ContainerException.php b/src/Internal/DependencyManagement/ContainerException.php
index 916b1855e31..de8499e5977 100644
--- a/src/Internal/DependencyManagement/ContainerException.php
+++ b/src/Internal/DependencyManagement/ContainerException.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ExtendedContainer class file.
- *
- * @package Automattic\WooCommerce\Internal\DependencyManagement
  */
 
 namespace Automattic\WooCommerce\Internal\DependencyManagement;
diff --git a/src/Internal/DependencyManagement/ExtendedContainer.php b/src/Internal/DependencyManagement/ExtendedContainer.php
index 6344489bdb2..eaaf4996b8e 100644
--- a/src/Internal/DependencyManagement/ExtendedContainer.php
+++ b/src/Internal/DependencyManagement/ExtendedContainer.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ExtendedContainer class file.
- *
- * @package Automattic\WooCommerce\Internal\DependencyManagement
  */
 
 namespace Automattic\WooCommerce\Internal\DependencyManagement;
diff --git a/src/Internal/DependencyManagement/ServiceProviders/ProxiesServiceProvider.php b/src/Internal/DependencyManagement/ServiceProviders/ProxiesServiceProvider.php
index b864bda2e21..c73be90a360 100644
--- a/src/Internal/DependencyManagement/ServiceProviders/ProxiesServiceProvider.php
+++ b/src/Internal/DependencyManagement/ServiceProviders/ProxiesServiceProvider.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Proxies class file.
- *
- * @package Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders
  */
 
 namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
diff --git a/src/Internal/WCCom/ConnectionHelper.php b/src/Internal/WCCom/ConnectionHelper.php
index ab159f6e488..d3c771da628 100644
--- a/src/Internal/WCCom/ConnectionHelper.php
+++ b/src/Internal/WCCom/ConnectionHelper.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Helpers for managing connection to WooCommerce.com.
- *
- * @package Automattic\WooCommerce\Internals\WCCom
  */
 
 namespace Automattic\WooCommerce\Internal\WCCom;
diff --git a/src/Packages.php b/src/Packages.php
index f58a2a75da5..d3332e9fa75 100644
--- a/src/Packages.php
+++ b/src/Packages.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Loads WooCommece packages from the /packages directory. These are packages developed outside of core.
- *
- * @package Automattic/WooCommerce
  */
 
 namespace Automattic\WooCommerce;
diff --git a/src/Proxies/ActionsProxy.php b/src/Proxies/ActionsProxy.php
index 7e5d583b8d6..6fe4173f643 100644
--- a/src/Proxies/ActionsProxy.php
+++ b/src/Proxies/ActionsProxy.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ActionsProxy class file.
- *
- * @package Automattic/WooCommerce/Tools/Proxies
  */
 
 namespace Automattic\WooCommerce\Proxies;
@@ -11,8 +9,6 @@ namespace Automattic\WooCommerce\Proxies;
  * Proxy for interacting with WordPress actions and filters.
  *
  * This class should be used instead of directly accessing the WordPress functions, to ease unit testing.
- *
- * @package Automattic\WooCommerce\Tools\Proxies
  */
 class ActionsProxy {
 
diff --git a/src/Proxies/LegacyProxy.php b/src/Proxies/LegacyProxy.php
index c110b686f92..14b4514b741 100644
--- a/src/Proxies/LegacyProxy.php
+++ b/src/Proxies/LegacyProxy.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * LegacyProxy class file.
- *
- * @package Automattic/WooCommerce/Tools/Proxies
  */
 
 namespace Automattic\WooCommerce\Proxies;
@@ -15,8 +13,6 @@ use \Psr\Container\ContainerInterface as Container;
  * This class should be used to interact with code outside the `src` directory, especially functions and classes
  * in the `includes` directory, unless a more specific proxy exists for the functionality at hand (e.g. `ActionsProxy`).
  * Idempotent functions can be executed directly.
- *
- * @package Automattic\WooCommerce\Tools\Proxies
  */
 class LegacyProxy {
 
diff --git a/templates/archive-product.php b/templates/archive-product.php
index e4f3938b3e4..998cd5c12e6 100644
--- a/templates/archive-product.php
+++ b/templates/archive-product.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/auth/footer.php b/templates/auth/footer.php
index 85c4726a951..69a5252c823 100644
--- a/templates/auth/footer.php
+++ b/templates/auth/footer.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Auth
+ * @package WooCommerce\Templates\Auth
  * @version 2.4.0
  */
 
diff --git a/templates/auth/form-grant-access.php b/templates/auth/form-grant-access.php
index f77fb2e2fe9..0b67e7ac8ee 100644
--- a/templates/auth/form-grant-access.php
+++ b/templates/auth/form-grant-access.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Auth
+ * @package WooCommerce\Templates\Auth
  * @version 4.3.0
  */
 
diff --git a/templates/auth/form-login.php b/templates/auth/form-login.php
index 8aa5330044a..3606ca0a7a3 100644
--- a/templates/auth/form-login.php
+++ b/templates/auth/form-login.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Auth
+ * @package WooCommerce\Templates\Auth
  * @version 3.4.0
  */
 
diff --git a/templates/auth/header.php b/templates/auth/header.php
index 913eed0f4f4..e05ccc939b8 100644
--- a/templates/auth/header.php
+++ b/templates/auth/header.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Auth
+ * @package WooCommerce\Templates\Auth
  * @version 2.4.0
  */
 
diff --git a/templates/cart/cart-empty.php b/templates/cart/cart-empty.php
index 739c8a8c6d2..b4069165629 100644
--- a/templates/cart/cart-empty.php
+++ b/templates/cart/cart-empty.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/cart/cart-item-data.php b/templates/cart/cart-item-data.php
index 2f2ab6f0601..d93000910a9 100644
--- a/templates/cart/cart-item-data.php
+++ b/templates/cart/cart-item-data.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     2.4.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/templates/cart/cart-shipping.php b/templates/cart/cart-shipping.php
index 1bad8799f88..134b05b3496 100644
--- a/templates/cart/cart-shipping.php
+++ b/templates/cart/cart-shipping.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/cart/cart-totals.php b/templates/cart/cart-totals.php
index e9602e0314d..f5af332ca9b 100644
--- a/templates/cart/cart-totals.php
+++ b/templates/cart/cart-totals.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.3.6
  */
 
diff --git a/templates/cart/cross-sells.php b/templates/cart/cross-sells.php
index 1312c5242df..2f9a4781cf9 100644
--- a/templates/cart/cross-sells.php
+++ b/templates/cart/cross-sells.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.4.0
  */
 
diff --git a/templates/cart/mini-cart.php b/templates/cart/mini-cart.php
index 3d3be6423d3..57c73ff56d9 100644
--- a/templates/cart/mini-cart.php
+++ b/templates/cart/mini-cart.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.7.0
  */
 
diff --git a/templates/cart/proceed-to-checkout-button.php b/templates/cart/proceed-to-checkout-button.php
index ea17318117f..d678926e88c 100644
--- a/templates/cart/proceed-to-checkout-button.php
+++ b/templates/cart/proceed-to-checkout-button.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.4.0
  */
 
diff --git a/templates/cart/shipping-calculator.php b/templates/cart/shipping-calculator.php
index 441ab92e0ad..3cd4402b442 100644
--- a/templates/cart/shipping-calculator.php
+++ b/templates/cart/shipping-calculator.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.0.0
  */
 
diff --git a/templates/checkout/cart-errors.php b/templates/checkout/cart-errors.php
index c16f09fe08f..85a280e8a38 100644
--- a/templates/checkout/cart-errors.php
+++ b/templates/checkout/cart-errors.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/checkout/form-billing.php b/templates/checkout/form-billing.php
index 731b3187c3a..9889929e2e4 100644
--- a/templates/checkout/form-billing.php
+++ b/templates/checkout/form-billing.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  * @global WC_Checkout $checkout
  */
diff --git a/templates/checkout/form-checkout.php b/templates/checkout/form-checkout.php
index db9f9d35b0a..00d5459985d 100644
--- a/templates/checkout/form-checkout.php
+++ b/templates/checkout/form-checkout.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/checkout/form-coupon.php b/templates/checkout/form-coupon.php
index 3bfc0f1fb36..bca033618fa 100644
--- a/templates/checkout/form-coupon.php
+++ b/templates/checkout/form-coupon.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.4
  */
 
diff --git a/templates/checkout/form-login.php b/templates/checkout/form-login.php
index b838a59f90c..c9da081bd8b 100644
--- a/templates/checkout/form-login.php
+++ b/templates/checkout/form-login.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.8.0
  */
 
diff --git a/templates/checkout/form-pay.php b/templates/checkout/form-pay.php
index 98bb85d6996..b9244b6e210 100644
--- a/templates/checkout/form-pay.php
+++ b/templates/checkout/form-pay.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/checkout/form-shipping.php b/templates/checkout/form-shipping.php
index 3e2c164f07d..f395ba25368 100644
--- a/templates/checkout/form-shipping.php
+++ b/templates/checkout/form-shipping.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  * @global WC_Checkout $checkout
  */
diff --git a/templates/checkout/order-receipt.php b/templates/checkout/order-receipt.php
index fae638a9ff4..bd8ca6f39fb 100644
--- a/templates/checkout/order-receipt.php
+++ b/templates/checkout/order-receipt.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.2.0
  */
 
diff --git a/templates/checkout/payment-method.php b/templates/checkout/payment-method.php
index 0e8a654508a..a3d4dbd1384 100644
--- a/templates/checkout/payment-method.php
+++ b/templates/checkout/payment-method.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.5.0
  */
 
diff --git a/templates/checkout/payment.php b/templates/checkout/payment.php
index 7262fc55ffa..a5467a71c72 100644
--- a/templates/checkout/payment.php
+++ b/templates/checkout/payment.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.3
  */
 
diff --git a/templates/checkout/review-order.php b/templates/checkout/review-order.php
index 3fb3639f806..e85d43dc39c 100644
--- a/templates/checkout/review-order.php
+++ b/templates/checkout/review-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.8.0
  */
 
diff --git a/templates/checkout/terms.php b/templates/checkout/terms.php
index cca6c52b08f..21ade908400 100644
--- a/templates/checkout/terms.php
+++ b/templates/checkout/terms.php
@@ -2,7 +2,7 @@
 /**
  * Checkout terms and conditions area.
  *
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php
index ad89003f2d2..35f457bc67f 100644
--- a/templates/checkout/thankyou.php
+++ b/templates/checkout/thankyou.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.7.0
  */
 
diff --git a/templates/content-product.php b/templates/content-product.php
index 3d5f0d5347a..6058ebbebbd 100644
--- a/templates/content-product.php
+++ b/templates/content-product.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/content-product_cat.php b/templates/content-product_cat.php
index 1eeea197c48..1a67fcddd9f 100644
--- a/templates/content-product_cat.php
+++ b/templates/content-product_cat.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.6.1
  */
 
diff --git a/templates/content-single-product.php b/templates/content-single-product.php
index edcd3d19741..37a2c063661 100644
--- a/templates/content-single-product.php
+++ b/templates/content-single-product.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/content-widget-price-filter.php b/templates/content-widget-price-filter.php
index d7bb4148c18..a491d343fc1 100644
--- a/templates/content-widget-price-filter.php
+++ b/templates/content-widget-price-filter.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.7.1
  */
 
diff --git a/templates/content-widget-product.php b/templates/content-widget-product.php
index 9d8a47e6348..a64ff1e10aa 100644
--- a/templates/content-widget-product.php
+++ b/templates/content-widget-product.php
@@ -10,7 +10,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.5
  */
 
diff --git a/templates/content-widget-reviews.php b/templates/content-widget-reviews.php
index cd29c237acb..d46cbd5873f 100644
--- a/templates/content-widget-reviews.php
+++ b/templates/content-widget-reviews.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/emails/admin-cancelled-order.php b/templates/emails/admin-cancelled-order.php
index d83dc28b765..af117403f0d 100644
--- a/templates/emails/admin-cancelled-order.php
+++ b/templates/emails/admin-cancelled-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 4.1.0
  */
 
diff --git a/templates/emails/admin-failed-order.php b/templates/emails/admin-failed-order.php
index 528492b6d6e..7fa1da5c203 100644
--- a/templates/emails/admin-failed-order.php
+++ b/templates/emails/admin-failed-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/admin-new-order.php b/templates/emails/admin-new-order.php
index cefa3439f66..8f20c7d1276 100644
--- a/templates/emails/admin-new-order.php
+++ b/templates/emails/admin-new-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/HTML
+ * @package WooCommerce\Templates\Emails\HTML
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-completed-order.php b/templates/emails/customer-completed-order.php
index fe83f0e11a8..75de74a045f 100644
--- a/templates/emails/customer-completed-order.php
+++ b/templates/emails/customer-completed-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-invoice.php b/templates/emails/customer-invoice.php
index 1fd444d14e4..e0564448390 100644
--- a/templates/emails/customer-invoice.php
+++ b/templates/emails/customer-invoice.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-new-account.php b/templates/emails/customer-new-account.php
index e0c18310076..3154c7cdde2 100644
--- a/templates/emails/customer-new-account.php
+++ b/templates/emails/customer-new-account.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-note.php b/templates/emails/customer-note.php
index 696e081c26f..8b5734f05ca 100644
--- a/templates/emails/customer-note.php
+++ b/templates/emails/customer-note.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-on-hold-order.php b/templates/emails/customer-on-hold-order.php
index 36ca694a174..d19bf8d199e 100644
--- a/templates/emails/customer-on-hold-order.php
+++ b/templates/emails/customer-on-hold-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-processing-order.php b/templates/emails/customer-processing-order.php
index 798763aa024..8227ce9a50d 100644
--- a/templates/emails/customer-processing-order.php
+++ b/templates/emails/customer-processing-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-refunded-order.php b/templates/emails/customer-refunded-order.php
index d2bdbe981e9..fbd5e351f4b 100644
--- a/templates/emails/customer-refunded-order.php
+++ b/templates/emails/customer-refunded-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/customer-reset-password.php b/templates/emails/customer-reset-password.php
index 7166442b12e..1b418087261 100644
--- a/templates/emails/customer-reset-password.php
+++ b/templates/emails/customer-reset-password.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 4.0.0
  */
 
diff --git a/templates/emails/email-addresses.php b/templates/emails/email-addresses.php
index d36a023cce2..8e9d7032432 100644
--- a/templates/emails/email-addresses.php
+++ b/templates/emails/email-addresses.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.9.0
  */
 
diff --git a/templates/emails/email-customer-details.php b/templates/emails/email-customer-details.php
index ee09fd2aa60..70c42c2ec3d 100644
--- a/templates/emails/email-customer-details.php
+++ b/templates/emails/email-customer-details.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 2.5.0
  */
 
diff --git a/templates/emails/email-downloads.php b/templates/emails/email-downloads.php
index a5fcff7f353..6fce4728ab7 100644
--- a/templates/emails/email-downloads.php
+++ b/templates/emails/email-downloads.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/emails/email-footer.php b/templates/emails/email-footer.php
index 0330de1dd31..4579924cd85 100644
--- a/templates/emails/email-footer.php
+++ b/templates/emails/email-footer.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/email-header.php b/templates/emails/email-header.php
index da949e827da..23793c022ab 100644
--- a/templates/emails/email-header.php
+++ b/templates/emails/email-header.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 4.0.0
  */
 
diff --git a/templates/emails/email-order-details.php b/templates/emails/email-order-details.php
index b591fc0f006..2184d691e3e 100644
--- a/templates/emails/email-order-details.php
+++ b/templates/emails/email-order-details.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/email-order-items.php b/templates/emails/email-order-items.php
index 33fc1132a42..74bc9c119e8 100644
--- a/templates/emails/email-order-items.php
+++ b/templates/emails/email-order-items.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/email-styles.php b/templates/emails/email-styles.php
index 081a8ece64e..df8dd4e8a10 100644
--- a/templates/emails/email-styles.php
+++ b/templates/emails/email-styles.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 4.0.0
  */
 
diff --git a/templates/emails/plain/admin-cancelled-order.php b/templates/emails/plain/admin-cancelled-order.php
index 30117f7dc3a..271ab6dda83 100644
--- a/templates/emails/plain/admin-cancelled-order.php
+++ b/templates/emails/plain/admin-cancelled-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 4.1.0
  */
 
diff --git a/templates/emails/plain/admin-failed-order.php b/templates/emails/plain/admin-failed-order.php
index 9c0cd2441b1..90148e6eca6 100644
--- a/templates/emails/plain/admin-failed-order.php
+++ b/templates/emails/plain/admin-failed-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/admin-new-order.php b/templates/emails/plain/admin-new-order.php
index 82efa4259a3..97931f666af 100644
--- a/templates/emails/plain/admin-new-order.php
+++ b/templates/emails/plain/admin-new-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-completed-order.php b/templates/emails/plain/customer-completed-order.php
index 129556b4940..56f007125f2 100644
--- a/templates/emails/plain/customer-completed-order.php
+++ b/templates/emails/plain/customer-completed-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-invoice.php b/templates/emails/plain/customer-invoice.php
index 32a6bdb9c78..a70e6108e4e 100644
--- a/templates/emails/plain/customer-invoice.php
+++ b/templates/emails/plain/customer-invoice.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-new-account.php b/templates/emails/plain/customer-new-account.php
index 4dcb04e3820..56204d24bdb 100644
--- a/templates/emails/plain/customer-new-account.php
+++ b/templates/emails/plain/customer-new-account.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-note.php b/templates/emails/plain/customer-note.php
index 4f593ba75db..85f0f4a0f3d 100644
--- a/templates/emails/plain/customer-note.php
+++ b/templates/emails/plain/customer-note.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-on-hold-order.php b/templates/emails/plain/customer-on-hold-order.php
index 3a5ba46b744..b5dec0ad882 100644
--- a/templates/emails/plain/customer-on-hold-order.php
+++ b/templates/emails/plain/customer-on-hold-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-processing-order.php b/templates/emails/plain/customer-processing-order.php
index 57c8860c2a6..fead3d79224 100644
--- a/templates/emails/plain/customer-processing-order.php
+++ b/templates/emails/plain/customer-processing-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-refunded-order.php b/templates/emails/plain/customer-refunded-order.php
index 1aa31a53bb8..a6626d37165 100644
--- a/templates/emails/plain/customer-refunded-order.php
+++ b/templates/emails/plain/customer-refunded-order.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/customer-reset-password.php b/templates/emails/plain/customer-reset-password.php
index 12f5a6bade8..efc4e5b8c26 100644
--- a/templates/emails/plain/customer-reset-password.php
+++ b/templates/emails/plain/customer-reset-password.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/email-addresses.php b/templates/emails/plain/email-addresses.php
index 2f14522c99d..92ec35eec07 100644
--- a/templates/emails/plain/email-addresses.php
+++ b/templates/emails/plain/email-addresses.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.4.0
  */
 
diff --git a/templates/emails/plain/email-customer-details.php b/templates/emails/plain/email-customer-details.php
index f5b0ebf91f0..e86c24a2fdb 100644
--- a/templates/emails/plain/email-customer-details.php
+++ b/templates/emails/plain/email-customer-details.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails/Plain
+ * @package WooCommerce\Templates\Emails\Plain
  * @version 3.4.0
  */
 
diff --git a/templates/emails/plain/email-downloads.php b/templates/emails/plain/email-downloads.php
index 95e3bd19fd1..12855128873 100644
--- a/templates/emails/plain/email-downloads.php
+++ b/templates/emails/plain/email-downloads.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/emails/plain/email-order-details.php b/templates/emails/plain/email-order-details.php
index c9e371fdc49..3a292aa412f 100644
--- a/templates/emails/plain/email-order-details.php
+++ b/templates/emails/plain/email-order-details.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates/Emails
+ * @package WooCommerce\Templates\Emails
  * @version 3.7.0
  */
 
diff --git a/templates/emails/plain/email-order-items.php b/templates/emails/plain/email-order-items.php
index 92a30c27fec..bcd446630e9 100644
--- a/templates/emails/plain/email-order-items.php
+++ b/templates/emails/plain/email-order-items.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates/Emails/Plain
+ * @package     WooCommerce\Templates\Emails\Plain
  * @version     3.7.0
  */
 
diff --git a/templates/global/breadcrumb.php b/templates/global/breadcrumb.php
index 4da8469c826..3d6bc21aa5a 100644
--- a/templates/global/breadcrumb.php
+++ b/templates/global/breadcrumb.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     2.3.0
  * @see         woocommerce_breadcrumb()
  */
diff --git a/templates/global/form-login.php b/templates/global/form-login.php
index 74fcd651065..1c64a4439b2 100644
--- a/templates/global/form-login.php
+++ b/templates/global/form-login.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.6.0
  */
 
diff --git a/templates/global/quantity-input.php b/templates/global/quantity-input.php
index f2994813d92..172fc858e6c 100644
--- a/templates/global/quantity-input.php
+++ b/templates/global/quantity-input.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.0.0
  */
 
diff --git a/templates/global/sidebar.php b/templates/global/sidebar.php
index 98622e715f3..ed499b4b442 100644
--- a/templates/global/sidebar.php
+++ b/templates/global/sidebar.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/templates/global/wrapper-end.php b/templates/global/wrapper-end.php
index 9f5c4ad7300..3072175de77 100644
--- a/templates/global/wrapper-end.php
+++ b/templates/global/wrapper-end.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.3.0
  */
 
diff --git a/templates/global/wrapper-start.php b/templates/global/wrapper-start.php
index 2bf8e7dd52e..aceb891a35d 100644
--- a/templates/global/wrapper-start.php
+++ b/templates/global/wrapper-start.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.3.0
  */
 
diff --git a/templates/loop/add-to-cart.php b/templates/loop/add-to-cart.php
index b2637d41b2d..9e4dda075e1 100644
--- a/templates/loop/add-to-cart.php
+++ b/templates/loop/add-to-cart.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.3.0
  */
 
diff --git a/templates/loop/loop-end.php b/templates/loop/loop-end.php
index 5d92f1252f1..802acb977b5 100644
--- a/templates/loop/loop-end.php
+++ b/templates/loop/loop-end.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     2.0.0
  */
 
diff --git a/templates/loop/loop-start.php b/templates/loop/loop-start.php
index 0fa6c789159..b2d4960114b 100644
--- a/templates/loop/loop-start.php
+++ b/templates/loop/loop-start.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.3.0
  */
 
diff --git a/templates/loop/no-products-found.php b/templates/loop/no-products-found.php
index b4db1b0ffa7..906edb35b15 100644
--- a/templates/loop/no-products-found.php
+++ b/templates/loop/no-products-found.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.0.0
  */
 
diff --git a/templates/loop/orderby.php b/templates/loop/orderby.php
index 8b660ac99e7..5b2c1f80f6f 100644
--- a/templates/loop/orderby.php
+++ b/templates/loop/orderby.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.6.0
  */
 
diff --git a/templates/loop/pagination.php b/templates/loop/pagination.php
index cfa3763dce0..9d61f8799cf 100644
--- a/templates/loop/pagination.php
+++ b/templates/loop/pagination.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.3.1
  */
 
diff --git a/templates/loop/price.php b/templates/loop/price.php
index 31ec3d42899..951ca1794e7 100644
--- a/templates/loop/price.php
+++ b/templates/loop/price.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/templates/loop/rating.php b/templates/loop/rating.php
index 560d72e4dcf..9b29acac5f0 100644
--- a/templates/loop/rating.php
+++ b/templates/loop/rating.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/loop/result-count.php b/templates/loop/result-count.php
index 1f1798261a3..faec64365a4 100644
--- a/templates/loop/result-count.php
+++ b/templates/loop/result-count.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.7.0
  */
 
diff --git a/templates/loop/sale-flash.php b/templates/loop/sale-flash.php
index cf537316257..2b35f769064 100644
--- a/templates/loop/sale-flash.php
+++ b/templates/loop/sale-flash.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/templates/myaccount/dashboard.php b/templates/myaccount/dashboard.php
index d1a413e50ce..9f79a916cd8 100644
--- a/templates/myaccount/dashboard.php
+++ b/templates/myaccount/dashboard.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.4.0
  */
 
diff --git a/templates/myaccount/downloads.php b/templates/myaccount/downloads.php
index b06139e050b..630b7fc6d26 100644
--- a/templates/myaccount/downloads.php
+++ b/templates/myaccount/downloads.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.2.0
  */
 
diff --git a/templates/myaccount/form-add-payment-method.php b/templates/myaccount/form-add-payment-method.php
index ec84ba4a718..71b859aa4db 100644
--- a/templates/myaccount/form-add-payment-method.php
+++ b/templates/myaccount/form-add-payment-method.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.3.0
  */
 
diff --git a/templates/myaccount/form-edit-account.php b/templates/myaccount/form-edit-account.php
index 27d932a32a7..eb5dfd180b5 100644
--- a/templates/myaccount/form-edit-account.php
+++ b/templates/myaccount/form-edit-account.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/myaccount/form-edit-address.php b/templates/myaccount/form-edit-address.php
index 408fd86e0fb..6916bef15c7 100644
--- a/templates/myaccount/form-edit-address.php
+++ b/templates/myaccount/form-edit-address.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index 9ffa25aeb63..66801791c4b 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.1.0
  */
 
diff --git a/templates/myaccount/form-lost-password.php b/templates/myaccount/form-lost-password.php
index f537282fb1d..15fc984a745 100644
--- a/templates/myaccount/form-lost-password.php
+++ b/templates/myaccount/form-lost-password.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.2
  */
 
diff --git a/templates/myaccount/form-reset-password.php b/templates/myaccount/form-reset-password.php
index b97991e4038..3106f6022da 100644
--- a/templates/myaccount/form-reset-password.php
+++ b/templates/myaccount/form-reset-password.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.5
  */
 
diff --git a/templates/myaccount/lost-password-confirmation.php b/templates/myaccount/lost-password-confirmation.php
index f2376f64c6f..14665a8c9f3 100644
--- a/templates/myaccount/lost-password-confirmation.php
+++ b/templates/myaccount/lost-password-confirmation.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.9.0
  */
 
diff --git a/templates/myaccount/my-account.php b/templates/myaccount/my-account.php
index d724d7adc10..9a4f85f875e 100644
--- a/templates/myaccount/my-account.php
+++ b/templates/myaccount/my-account.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php
index 97f560a3eb0..5cd3161a3ac 100644
--- a/templates/myaccount/my-address.php
+++ b/templates/myaccount/my-address.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.6.0
  */
 
diff --git a/templates/myaccount/my-downloads.php b/templates/myaccount/my-downloads.php
index 85046fc133b..8c3544e561a 100644
--- a/templates/myaccount/my-downloads.php
+++ b/templates/myaccount/my-downloads.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     2.0.0
  * @deprecated  2.6.0
  */
diff --git a/templates/myaccount/my-orders.php b/templates/myaccount/my-orders.php
index 0b671f01325..77761e0486c 100644
--- a/templates/myaccount/my-orders.php
+++ b/templates/myaccount/my-orders.php
@@ -3,7 +3,7 @@
  * My Orders - Deprecated
  *
  * @deprecated 2.6.0 this template file is no longer used. My Account shortcode uses orders.php.
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/templates/myaccount/navigation.php b/templates/myaccount/navigation.php
index cca86825258..8fc0db02388 100644
--- a/templates/myaccount/navigation.php
+++ b/templates/myaccount/navigation.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.6.0
  */
 
diff --git a/templates/myaccount/orders.php b/templates/myaccount/orders.php
index b9059b9cfc6..b36005b2101 100644
--- a/templates/myaccount/orders.php
+++ b/templates/myaccount/orders.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.7.0
  */
 
diff --git a/templates/myaccount/payment-methods.php b/templates/myaccount/payment-methods.php
index a016cf2445c..8c6ad65b296 100644
--- a/templates/myaccount/payment-methods.php
+++ b/templates/myaccount/payment-methods.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.6.0
  */
 
diff --git a/templates/myaccount/view-order.php b/templates/myaccount/view-order.php
index a75dec89a15..2691e3dfc67 100644
--- a/templates/myaccount/view-order.php
+++ b/templates/myaccount/view-order.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.0.0
  */
 
diff --git a/templates/notices/error.php b/templates/notices/error.php
index 8bbeeb7adf3..fe4af627643 100644
--- a/templates/notices/error.php
+++ b/templates/notices/error.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.9.0
  */
 
diff --git a/templates/notices/notice.php b/templates/notices/notice.php
index b300f8d10a9..4e611df074d 100644
--- a/templates/notices/notice.php
+++ b/templates/notices/notice.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.9.0
  */
 
diff --git a/templates/notices/success.php b/templates/notices/success.php
index 17b5fc19af5..e8643e57b83 100644
--- a/templates/notices/success.php
+++ b/templates/notices/success.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.9.0
  */
 
diff --git a/templates/order/form-tracking.php b/templates/order/form-tracking.php
index be4eb2d9cc2..d26f1a062a9 100644
--- a/templates/order/form-tracking.php
+++ b/templates/order/form-tracking.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/order/order-again.php b/templates/order/order-again.php
index 9c5ab84c0d5..f7bc2242cdd 100644
--- a/templates/order/order-again.php
+++ b/templates/order/order-again.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/order/order-details-customer.php b/templates/order/order-details-customer.php
index 4dc37ac7850..62db6400719 100644
--- a/templates/order/order-details-customer.php
+++ b/templates/order/order-details-customer.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.4
  */
 
diff --git a/templates/order/order-details-item.php b/templates/order/order-details-item.php
index 68fb1883adb..7894d37b92f 100644
--- a/templates/order/order-details-item.php
+++ b/templates/order/order-details-item.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.7.0
  */
 
diff --git a/templates/order/order-details.php b/templates/order/order-details.php
index 17f82e1bc27..a63bb53df0b 100644
--- a/templates/order/order-details.php
+++ b/templates/order/order-details.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.7.0
  */
 
diff --git a/templates/order/order-downloads.php b/templates/order/order-downloads.php
index 1a7c28469ec..9566cd34162 100644
--- a/templates/order/order-downloads.php
+++ b/templates/order/order-downloads.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.3.0
  */
 
diff --git a/templates/order/tracking.php b/templates/order/tracking.php
index c1bc9a75dd1..7e9d55422f1 100644
--- a/templates/order/tracking.php
+++ b/templates/order/tracking.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.2.0
  */
 
diff --git a/templates/product-searchform.php b/templates/product-searchform.php
index 92e515b9fd5..c6c92bd5fbd 100644
--- a/templates/product-searchform.php
+++ b/templates/product-searchform.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.3.0
  */
 
diff --git a/templates/single-product-reviews.php b/templates/single-product-reviews.php
index 8ed5a42b970..995a11ea348 100644
--- a/templates/single-product-reviews.php
+++ b/templates/single-product-reviews.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.3.0
  */
 
diff --git a/templates/single-product.php b/templates/single-product.php
index 66598ae6a26..39eeb1df18e 100644
--- a/templates/single-product.php
+++ b/templates/single-product.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/templates/single-product/add-to-cart/external.php b/templates/single-product/add-to-cart/external.php
index 8a9e3e0d6ca..92039e72f9b 100644
--- a/templates/single-product/add-to-cart/external.php
+++ b/templates/single-product/add-to-cart/external.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/single-product/add-to-cart/grouped.php b/templates/single-product/add-to-cart/grouped.php
index 5193f93b34b..98c6561f946 100644
--- a/templates/single-product/add-to-cart/grouped.php
+++ b/templates/single-product/add-to-cart/grouped.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 4.0.0
  */
 
diff --git a/templates/single-product/add-to-cart/simple.php b/templates/single-product/add-to-cart/simple.php
index 5fcae249d91..494ece1c465 100644
--- a/templates/single-product/add-to-cart/simple.php
+++ b/templates/single-product/add-to-cart/simple.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/single-product/add-to-cart/variable.php b/templates/single-product/add-to-cart/variable.php
index e11fd49c8e7..4d1424845b4 100644
--- a/templates/single-product/add-to-cart/variable.php
+++ b/templates/single-product/add-to-cart/variable.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.5
  */
 
diff --git a/templates/single-product/add-to-cart/variation-add-to-cart-button.php b/templates/single-product/add-to-cart/variation-add-to-cart-button.php
index 00972daf381..03b7aeb02a9 100644
--- a/templates/single-product/add-to-cart/variation-add-to-cart-button.php
+++ b/templates/single-product/add-to-cart/variation-add-to-cart-button.php
@@ -3,7 +3,7 @@
  * Single variation cart button
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/single-product/add-to-cart/variation.php b/templates/single-product/add-to-cart/variation.php
index 18475a59e0a..af3dde3d5f9 100644
--- a/templates/single-product/add-to-cart/variation.php
+++ b/templates/single-product/add-to-cart/variation.php
@@ -6,7 +6,7 @@
  * The values will be dynamically replaced after selecting attributes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.5.0
  */
 
diff --git a/templates/single-product/meta.php b/templates/single-product/meta.php
index 9a76e18786f..68a7e0f78d2 100644
--- a/templates/single-product/meta.php
+++ b/templates/single-product/meta.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.0.0
  */
 
diff --git a/templates/single-product/photoswipe.php b/templates/single-product/photoswipe.php
index 7d91793ef16..761b0b167ea 100644
--- a/templates/single-product/photoswipe.php
+++ b/templates/single-product/photoswipe.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.0.0
  */
 
diff --git a/templates/single-product/price.php b/templates/single-product/price.php
index 4dd920dad28..38e6d4d2ce3 100644
--- a/templates/single-product/price.php
+++ b/templates/single-product/price.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.0.0
  */
 
diff --git a/templates/single-product/product-attributes.php b/templates/single-product/product-attributes.php
index cc0f236ba06..86faf529eeb 100644
--- a/templates/single-product/product-attributes.php
+++ b/templates/single-product/product-attributes.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php
index e6a028c5ce1..0399028c8d8 100644
--- a/templates/single-product/product-image.php
+++ b/templates/single-product/product-image.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.1
  */
 
diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php
index 6702e1a02b9..cec3f34fd25 100644
--- a/templates/single-product/product-thumbnails.php
+++ b/templates/single-product/product-thumbnails.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.5.1
  */
 
diff --git a/templates/single-product/rating.php b/templates/single-product/rating.php
index 14d2ff81aea..a758f8bd920 100644
--- a/templates/single-product/rating.php
+++ b/templates/single-product/rating.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/single-product/related.php b/templates/single-product/related.php
index a9b4210be57..a7d3a3edbf7 100644
--- a/templates/single-product/related.php
+++ b/templates/single-product/related.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.9.0
  */
 
diff --git a/templates/single-product/review-meta.php b/templates/single-product/review-meta.php
index 46dd3f161c1..f4fb2391e7c 100644
--- a/templates/single-product/review-meta.php
+++ b/templates/single-product/review-meta.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.4.0
  */
 
diff --git a/templates/single-product/review-rating.php b/templates/single-product/review-rating.php
index 532ef95f5d6..eabe57a5ee9 100644
--- a/templates/single-product/review-rating.php
+++ b/templates/single-product/review-rating.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.6.0
  */
 
diff --git a/templates/single-product/review.php b/templates/single-product/review.php
index f566e22d224..cc22770cadc 100644
--- a/templates/single-product/review.php
+++ b/templates/single-product/review.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.6.0
  */
 
diff --git a/templates/single-product/sale-flash.php b/templates/single-product/sale-flash.php
index e5e289e0ade..d3ce9654173 100644
--- a/templates/single-product/sale-flash.php
+++ b/templates/single-product/sale-flash.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/templates/single-product/share.php b/templates/single-product/share.php
index 760ea81eda7..eafae09cae9 100644
--- a/templates/single-product/share.php
+++ b/templates/single-product/share.php
@@ -13,7 +13,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.5.0
  */
 
diff --git a/templates/single-product/short-description.php b/templates/single-product/short-description.php
index 0bb12b743af..b2997718225 100644
--- a/templates/single-product/short-description.php
+++ b/templates/single-product/short-description.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.3.0
  */
 
diff --git a/templates/single-product/stock.php b/templates/single-product/stock.php
index ce877480b4e..d8b147733d4 100644
--- a/templates/single-product/stock.php
+++ b/templates/single-product/stock.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.0.0
  */
 
diff --git a/templates/single-product/tabs/additional-information.php b/templates/single-product/tabs/additional-information.php
index e50d827726e..f857b0c1f98 100644
--- a/templates/single-product/tabs/additional-information.php
+++ b/templates/single-product/tabs/additional-information.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.0.0
  */
 
diff --git a/templates/single-product/tabs/description.php b/templates/single-product/tabs/description.php
index 6b67db84266..e7018a7b523 100644
--- a/templates/single-product/tabs/description.php
+++ b/templates/single-product/tabs/description.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 2.0.0
  */
 
diff --git a/templates/single-product/tabs/tabs.php b/templates/single-product/tabs/tabs.php
index 83c00e1f1ba..819943c8ab1 100644
--- a/templates/single-product/tabs/tabs.php
+++ b/templates/single-product/tabs/tabs.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @package WooCommerce/Templates
+ * @package WooCommerce\Templates
  * @version 3.8.0
  */
 
diff --git a/templates/single-product/up-sells.php b/templates/single-product/up-sells.php
index 1da908c9ab2..36e5ed475cb 100644
--- a/templates/single-product/up-sells.php
+++ b/templates/single-product/up-sells.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     3.0.0
  */
 
diff --git a/templates/taxonomy-product_cat.php b/templates/taxonomy-product_cat.php
index 2bcc6af3ac6..9294065a625 100644
--- a/templates/taxonomy-product_cat.php
+++ b/templates/taxonomy-product_cat.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/templates/taxonomy-product_tag.php b/templates/taxonomy-product_tag.php
index ef1497dc3c8..2f83cd21471 100644
--- a/templates/taxonomy-product_tag.php
+++ b/templates/taxonomy-product_tag.php
@@ -11,7 +11,7 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
+ * @package     WooCommerce\Templates
  * @version     1.6.4
  */
 
diff --git a/tests/Tools/CodeHacking/CodeHacker.php b/tests/Tools/CodeHacking/CodeHacker.php
index 86b88959f37..8d31c09cd1c 100644
--- a/tests/Tools/CodeHacking/CodeHacker.php
+++ b/tests/Tools/CodeHacking/CodeHacker.php
@@ -2,7 +2,7 @@
 /**
  * CodeHacker class file.
  *
- * @package WooCommerce/Testing
+ * @package WooCommerce\Testing
  */
 
 //phpcs:disable WordPress.WP.AlternativeFunctions, WordPress.PHP.NoSilencedErrors.Discouraged
diff --git a/tests/Tools/CodeHacking/CodeHackerTestHook.php b/tests/Tools/CodeHacking/CodeHackerTestHook.php
index 18b0c9aafb6..b0399e0241a 100644
--- a/tests/Tools/CodeHacking/CodeHackerTestHook.php
+++ b/tests/Tools/CodeHacking/CodeHackerTestHook.php
@@ -2,7 +2,7 @@
 /**
  * CodeHackerTestHook class file.
  *
- * @package WooCommerce/Testing
+ * @package WooCommerce\Testing
  */
 
 namespace Automattic\WooCommerce\Testing\Tools\CodeHacking;
diff --git a/tests/Tools/CodeHacking/Hacks/BypassFinalsHack.php b/tests/Tools/CodeHacking/Hacks/BypassFinalsHack.php
index 0d5f0b4e2fb..f63f927e1d6 100644
--- a/tests/Tools/CodeHacking/Hacks/BypassFinalsHack.php
+++ b/tests/Tools/CodeHacking/Hacks/BypassFinalsHack.php
@@ -2,7 +2,7 @@
 /**
  * BypassFinalsHack class file.
  *
- * @package WooCommerce/Testing
+ * @package WooCommerce\Testing
  */
 
 namespace Automattic\WooCommerce\Testing\Tools\CodeHacking\Hacks;
diff --git a/tests/Tools/CodeHacking/Hacks/CodeHack.php b/tests/Tools/CodeHacking/Hacks/CodeHack.php
index 5f79b652558..94464e7496d 100644
--- a/tests/Tools/CodeHacking/Hacks/CodeHack.php
+++ b/tests/Tools/CodeHacking/Hacks/CodeHack.php
@@ -2,7 +2,7 @@
 /**
  * CodeHack class file.
  *
- * @package WooCommerce/Testing
+ * @package WooCommerce\Testing
  */
 
 namespace Automattic\WooCommerce\Testing\Tools\CodeHacking\Hacks;
diff --git a/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php b/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php
index 5d1d1cbb9c4..67ecabb59e0 100644
--- a/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php
+++ b/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php
@@ -2,7 +2,7 @@
 /**
  * FunctionsMockerHack class file.
  *
- * @package WooCommerce/Testing
+ * @package WooCommerce\Testing
  */
 
 namespace Automattic\WooCommerce\Testing\Tools\CodeHacking\Hacks;
diff --git a/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php b/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php
index 9d1709c3b1f..11a335f235e 100644
--- a/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php
+++ b/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php
@@ -2,7 +2,7 @@
 /**
  * StaticMockerHack class file.
  *
- * @package WooCommerce/Testing
+ * @package WooCommerce\Testing
  */
 
 namespace Automattic\WooCommerce\Testing\Tools\CodeHacking\Hacks;
diff --git a/tests/legacy/framework/helpers/class-wc-helper-order.php b/tests/legacy/framework/helpers/class-wc-helper-order.php
index fff89757e6f..457a37d011f 100644
--- a/tests/legacy/framework/helpers/class-wc-helper-order.php
+++ b/tests/legacy/framework/helpers/class-wc-helper-order.php
@@ -2,7 +2,7 @@
 /**
  * Order helpers.
  *
- * @package WooCommerce/Tests
+ * @package WooCommerce\Tests
  */
 
 /**
diff --git a/tests/legacy/framework/helpers/class-wc-helper-product.php b/tests/legacy/framework/helpers/class-wc-helper-product.php
index a7556b46f3a..a9bd4ac746b 100644
--- a/tests/legacy/framework/helpers/class-wc-helper-product.php
+++ b/tests/legacy/framework/helpers/class-wc-helper-product.php
@@ -2,7 +2,7 @@
 /**
  * Product helpers.
  *
- * @package woocommerce/tests
+ * @package WooCommerce\Tests
  */
 
 /**
diff --git a/tests/legacy/framework/helpers/class-wc-helper-shipping.php b/tests/legacy/framework/helpers/class-wc-helper-shipping.php
index 4436372638d..a54a5bed1f9 100644
--- a/tests/legacy/framework/helpers/class-wc-helper-shipping.php
+++ b/tests/legacy/framework/helpers/class-wc-helper-shipping.php
@@ -2,7 +2,7 @@
 /**
  * Helper class for shipping related unit tests.
  *
- * @package WooCommerce\Tests|Helper
+ * @package WooCommerce\Tests\Helper
  */
 
 /**
diff --git a/tests/legacy/unit-tests/checkout/checkout.php b/tests/legacy/unit-tests/checkout/checkout.php
index d6639ec88ab..4d99a0c38d7 100644
--- a/tests/legacy/unit-tests/checkout/checkout.php
+++ b/tests/legacy/unit-tests/checkout/checkout.php
@@ -2,7 +2,7 @@
 /**
  * Checkout tests.
  *
- * @package WooCommerce|Tests|Checkout
+ * @package WooCommerce\Tests\Checkout
  */
 
 /**
diff --git a/tests/legacy/unit-tests/order/class-wc-tests-order-functions.php b/tests/legacy/unit-tests/order/class-wc-tests-order-functions.php
index 5001b59305c..5c4ffd08cb0 100644
--- a/tests/legacy/unit-tests/order/class-wc-tests-order-functions.php
+++ b/tests/legacy/unit-tests/order/class-wc-tests-order-functions.php
@@ -2,7 +2,7 @@
 /**
  * Class WC_Tests_Order_Functions file.
  *
- * @package WooCommerce/Tests
+ * @package WooCommerce\Tests
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/tests/legacy/unit-tests/order/class-wc-tests-orders.php b/tests/legacy/unit-tests/order/class-wc-tests-orders.php
index 4877745a592..9073011470f 100644
--- a/tests/legacy/unit-tests/order/class-wc-tests-orders.php
+++ b/tests/legacy/unit-tests/order/class-wc-tests-orders.php
@@ -2,7 +2,7 @@
 /**
  * Class WC_Tests_Order file.
  *
- * @package WooCommerce|Tests|Order
+ * @package WooCommerce\Tests\Order
  */
 
 /**
diff --git a/tests/legacy/unit-tests/payment-gateways/cod.php b/tests/legacy/unit-tests/payment-gateways/cod.php
index 8766df0d37b..8dea53d70e5 100644
--- a/tests/legacy/unit-tests/payment-gateways/cod.php
+++ b/tests/legacy/unit-tests/payment-gateways/cod.php
@@ -2,7 +2,7 @@
 /**
  * Contains tests for the COD Payment Gateway.
  *
- * @package WooCommerce/Tests/PaymentGateways
+ * @package WooCommerce\Tests\PaymentGateways
  */
 
 use Automattic\Jetpack\Constants;
diff --git a/tests/legacy/unit-tests/payment-gateways/payment-gateways.php b/tests/legacy/unit-tests/payment-gateways/payment-gateways.php
index 7f839c0badd..3428db4971d 100644
--- a/tests/legacy/unit-tests/payment-gateways/payment-gateways.php
+++ b/tests/legacy/unit-tests/payment-gateways/payment-gateways.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package WooCommerce/Tests/PaymentGateways
+ * @package WooCommerce\Tests\PaymentGateways
  */
 
 /**
diff --git a/tests/legacy/unit-tests/templates/functions.php b/tests/legacy/unit-tests/templates/functions.php
index 5b1bbb49001..5ef1c017291 100644
--- a/tests/legacy/unit-tests/templates/functions.php
+++ b/tests/legacy/unit-tests/templates/functions.php
@@ -2,7 +2,7 @@
 /**
  * Test template funcitons.
  *
- * @package WooCommerce/Tests/Templates
+ * @package WooCommerce\Tests\Templates
  * @since   3.4.0
  */
 
diff --git a/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php b/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php
index 694fe754922..2f3bb9924d6 100644
--- a/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php
+++ b/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php
@@ -2,7 +2,7 @@
 /**
  * Testing WC_Widget functionality.
  *
- * @package WooCommerce/Tests/Widgets
+ * @package WooCommerce\Tests\Widgets
  */
 
 /**
diff --git a/tests/php/includes/class-wc-ajax-test.php b/tests/php/includes/class-wc-ajax-test.php
index 93904242f0a..afce0cb159a 100644
--- a/tests/php/includes/class-wc-ajax-test.php
+++ b/tests/php/includes/class-wc-ajax-test.php
@@ -2,7 +2,7 @@
 /**
  * Class WC_AJAX_Test file.
  *
- * @package WooCommerce|Tests|WC_AJAX.
+ * @package WooCommerce\Tests\WC_AJAX.
  */
 
 /**
diff --git a/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php b/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php
index 8dda4b654b8..cc241e61301 100644
--- a/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php
+++ b/tests/php/src/Internal/DependencyManagement/AbstractServiceProviderTest.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * AbstractServiceProviderTests class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement;
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php
index 0d45684ff20..6f62858af3a 100644
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php
+++ b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithConstructorArgumentWithoutTypeHint.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassWithConstructorArgumentWithoutTypeHint class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses;
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithDependencies.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithDependencies.php
index 9701dd9a049..acf1cbd825a 100644
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithDependencies.php
+++ b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithDependencies.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassWithDependencies class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses;
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php
index b4b89ba5b74..4e432a93a1e 100644
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php
+++ b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithPrivateConstructor.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassWithPrivateConstructor class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses;
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithScalarConstructorArgument.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithScalarConstructorArgument.php
index c7888d3c34c..576a831b1ee 100644
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithScalarConstructorArgument.php
+++ b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithScalarConstructorArgument.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassWithConstructorArgumentWithoutTypeHint class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses;
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithSingleton.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithSingleton.php
index 44205c8009e..776817c29ba 100644
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithSingleton.php
+++ b/tests/php/src/Internal/DependencyManagement/ExampleClasses/ClassWithSingleton.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassWithSingleton class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses
  */
 
 // This class is in the root namespace on purpose, since it simulates being a legacy class in the 'includes' directory.
diff --git a/tests/php/src/Internal/DependencyManagement/ExampleClasses/DependencyClass.php b/tests/php/src/Internal/DependencyManagement/ExampleClasses/DependencyClass.php
index 3305ee2a372..a2ac799402e 100644
--- a/tests/php/src/Internal/DependencyManagement/ExampleClasses/DependencyClass.php
+++ b/tests/php/src/Internal/DependencyManagement/ExampleClasses/DependencyClass.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * DependencyClass class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement\ExampleClasses;
diff --git a/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php b/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php
index e766e6c4436..3034fcae125 100644
--- a/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php
+++ b/tests/php/src/Internal/DependencyManagement/ExtendedContainerTest.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ExtendedContainerTests class file.
- *
- * @package Automattic\WooCommerce\Tests\Internal\DependencyManagement
  */
 
 namespace Automattic\WooCommerce\Tests\Internal\DependencyManagement;
diff --git a/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php b/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php
index b9692e16b8b..2f1985c095d 100644
--- a/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php
+++ b/tests/php/src/Proxies/ClassThatDependsOnLegacyCodeTest.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassThatDependsOnLegacyCodeTest class file
- *
- * @package Automattic\WooCommerce\Tests\Proxies
  */
 
 namespace Automattic\WooCommerce\Tests\Proxies;
diff --git a/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php b/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php
index a6c3b7ed13b..d9c18a65d6b 100644
--- a/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php
+++ b/tests/php/src/Proxies/ExampleClasses/ClassThatDependsOnLegacyCode.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * ClassThatDependsOnLegacyCode class file
- *
- * @package Automattic\WooCommerce\Tests\Proxies\ExampleClasses
  */
 
 namespace Automattic\WooCommerce\Tests\Proxies\ExampleClasses;
diff --git a/tests/php/src/Proxies/LegacyProxyTest.php b/tests/php/src/Proxies/LegacyProxyTest.php
index aebc9e80794..bc90f4f7fc2 100644
--- a/tests/php/src/Proxies/LegacyProxyTest.php
+++ b/tests/php/src/Proxies/LegacyProxyTest.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * LegacyProxyTests class file
- *
- * @package Automattic\WooCommerce\Tests\Proxies
  */
 
 namespace Automattic\WooCommerce\Tests\Proxies;
diff --git a/tests/php/src/Proxies/MockableLegacyProxyTest.php b/tests/php/src/Proxies/MockableLegacyProxyTest.php
index 5b739707e49..579f514a7bc 100644
--- a/tests/php/src/Proxies/MockableLegacyProxyTest.php
+++ b/tests/php/src/Proxies/MockableLegacyProxyTest.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * MockableLegacyProxyTests class file
- *
- * @package Automattic\WooCommerce\Tests\Proxies
  */
 
 namespace Automattic\WooCommerce\Tests\Proxies;
diff --git a/tests/unit-tests/widgets/class-wc-tests-widget-layered-nav.php b/tests/unit-tests/widgets/class-wc-tests-widget-layered-nav.php
index bd0a84daa37..82c3655f723 100644
--- a/tests/unit-tests/widgets/class-wc-tests-widget-layered-nav.php
+++ b/tests/unit-tests/widgets/class-wc-tests-widget-layered-nav.php
@@ -2,7 +2,7 @@
 /**
  * Testing WC_Widget_Layered_Nav functionality.
  *
- * @package WooCommerce/Tests/Widgets
+ * @package WooCommerce\Tests\Widgets
  */
 
 /**