diff --git a/i18n/states/JP.php b/i18n/states/JP.php
index 97cc8b1ccd3..3645cde7b3a 100644
--- a/i18n/states/JP.php
+++ b/i18n/states/JP.php
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 $states['JP'] = array(
-	'JP01' => __( 'Hokkaido', 'woocommerce' ),
+	'JP01' => __( 'Hokkai-do', 'woocommerce' ),
 	'JP02' => __( 'Aomori-ken', 'woocommerce' ),
 	'JP03' => __( 'Iwate-ken', 'woocommerce' ),
 	'JP04' => __( 'Miyagi-ken', 'woocommerce' ),
diff --git a/includes/class-wc-cli.php b/includes/class-wc-cli.php
index 09e55707032..c2de3b6fb8d 100644
--- a/includes/class-wc-cli.php
+++ b/includes/class-wc-cli.php
@@ -1,14 +1,17 @@
 <?php
+/**
+ * Enables WooCommerce, via the the command line.
+ *
+ * @package WooCommerce\CLI
+ * @version 3.0.0
+ */
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
 /**
- * Enables WooCommerce, via the the command line.
- *
- * @version 3.0.0
- * @package WooCommerce
- * @author  WooCommerce
+ * CLI class.
  */
 class WC_CLI {
 	/**
@@ -23,10 +26,10 @@ class WC_CLI {
 	 * Load command files.
 	 */
 	private function includes() {
-		require_once __DIR__ . '/cli/class-wc-cli-runner.php';
-		require_once __DIR__ . '/cli/class-wc-cli-rest-command.php';
-		require_once __DIR__ . '/cli/class-wc-cli-tool-command.php';
-		require_once __DIR__ . '/cli/class-wc-cli-update-command.php';
+		require_once dirname( __FILE__ ) . '/cli/class-wc-cli-runner.php';
+		require_once dirname( __FILE__ ) . '/cli/class-wc-cli-rest-command.php';
+		require_once dirname( __FILE__ ) . '/cli/class-wc-cli-tool-command.php';
+		require_once dirname( __FILE__ ) . '/cli/class-wc-cli-update-command.php';
 	}
 
 	/**
@@ -39,4 +42,4 @@ class WC_CLI {
 	}
 }
 
-new WC_CLI;
+new WC_CLI();
diff --git a/woocommerce.php b/woocommerce.php
index c3015da7109..a0016d5fcb1 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -6,13 +6,10 @@
  * Version: 3.3.0-rc.1
  * Author: Automattic
  * Author URI: https://woocommerce.com
- *
  * Text Domain: woocommerce
  * Domain Path: /i18n/languages/
  *
  * @package WooCommerce
- * @category Core
- * @author Automattic
  */
 
 if ( ! defined( 'ABSPATH' ) ) {