diff --git a/admin/post-types/product.php b/admin/post-types/product.php
index 1b2e8aa6ca9..fd9a7a6788c 100644
--- a/admin/post-types/product.php
+++ b/admin/post-types/product.php
@@ -372,7 +372,7 @@ function woocommerce_products_by_type() {
 		$output = "<select name='product_type' id='dropdown_product_type'>";
 		$output .= '<option value="">'.__( 'Show all product types', 'woocommerce' ).'</option>';
 		foreach($terms as $term) :
-			$output .="<option value='$term->name' ";
+			$output .="<option value='" . sanitize_title( $term->name ) . "' ";
 			if ( isset( $wp_query->query['product_type'] ) ) $output .=selected($term->slug, $wp_query->query['product_type'], false);
 			$output .=">";
 
diff --git a/admin/post-types/writepanels/writepanel-product_data.php b/admin/post-types/writepanels/writepanel-product_data.php
index 8e91c31dee7..205d58bf43d 100644
--- a/admin/post-types/writepanels/writepanel-product_data.php
+++ b/admin/post-types/writepanels/writepanel-product_data.php
@@ -30,7 +30,7 @@ function woocommerce_product_data_box() {
 	$thepostid = $post->ID;
 
 	if ( $terms = wp_get_object_terms( $post->ID, 'product_type' ) )
-		$product_type = current( $terms )->name;
+		$product_type = sanitize_title( current( $terms )->name );
 	else
 		$product_type = 'simple';
 
diff --git a/admin/woocommerce-admin-init.php b/admin/woocommerce-admin-init.php
index 1fae4c1a879..10b1581be10 100644
--- a/admin/woocommerce-admin-init.php
+++ b/admin/woocommerce-admin-init.php
@@ -454,7 +454,7 @@ function woocommerce_admin_scripts() {
 			'currency_format_decimal_sep'	=> esc_attr( stripslashes( get_option( 'woocommerce_price_decimal_sep' ) ) ),
 			'currency_format_thousand_sep'	=> esc_attr( stripslashes( get_option( 'woocommerce_price_thousand_sep' ) ) ),
 			'currency_format'				=> esc_attr( str_replace( array( '%1$s', '%2$s' ), array( '%s', '%v' ), get_woocommerce_price_format() ) ), // For accounting JS
-			'product_types'					=> get_terms( 'product_type', array( 'fields' => 'names' ) )
+			'product_types'					=> array_map( 'sanitize_title', get_terms( 'product_type', array( 'fields' => 'names' ) ) )
 		 );
 
 		wp_localize_script( 'woocommerce_writepanel', 'woocommerce_writepanel_params', $woocommerce_witepanel_params );
diff --git a/classes/class-wc-product-factory.php b/classes/class-wc-product-factory.php
index fcf8f9b5d85..195c7b4602a 100644
--- a/classes/class-wc-product-factory.php
+++ b/classes/class-wc-product-factory.php
@@ -43,10 +43,11 @@ class WC_Product_Factory {
 				$product_type = 'variation';
 			} else {
 				$terms        = get_the_terms( $product_id, 'product_type' );
-				$product_type = ! empty( $terms ) && isset( current( $terms )->name ) ? current( $terms )->name : 'simple';
+				$product_type = ! empty( $terms ) && isset( current( $terms )->name ) ? sanitize_title( current( $terms )->name ) : 'simple';
 			}
 
-			$classname = 'WC_Product_' . preg_replace( '/(?<=_)(.)/e', "strtoupper( '$1' )", ucfirst( $product_type ) );
+			// Create a WC coding standards compliant class name e.g. WC_Product_Type_Class instead of WC_Product_type-class
+			$classname = 'WC_Product_' . preg_replace( '/-(.)/e', "'_' . strtoupper( '$1' )", ucfirst( $product_type ) );
 		} else {
 			$classname = false;
 			$product_type = false;
diff --git a/woocommerce-ajax.php b/woocommerce-ajax.php
index 2d60a4801f1..c34957e8d19 100644
--- a/woocommerce-ajax.php
+++ b/woocommerce-ajax.php
@@ -655,6 +655,7 @@ function woocommerce_add_variation() {
 
 		$_tax_class = '';
 		$image_id = 0;
+		$variation = get_post( $variation_id ); // Get the variation object
 
 		include( 'admin/post-types/writepanels/variation-admin-html.php' );
 	}