diff --git a/classes/shortcodes/class-wc-shortcode-order-tracking.php b/classes/shortcodes/class-wc-shortcode-order-tracking.php
index 922f69f9e9e..a030e676b76 100644
--- a/classes/shortcodes/class-wc-shortcode-order-tracking.php
+++ b/classes/shortcodes/class-wc-shortcode-order-tracking.php
@@ -50,11 +50,11 @@ class WC_Shortcode_Order_Tracking {
 
 			if ( ! $order_id ) {
 
-				echo '<p class="woocommerce_error">' . __( 'Please enter a valid order ID', 'woocommerce' ) . '</p>';
+				echo '<p class="woocommerce-error">' . __( 'Please enter a valid order ID', 'woocommerce' ) . '</p>';
 
 			} elseif ( ! $order_email ) {
 
-				echo '<p class="woocommerce_error">' . __( 'Please enter a valid order email', 'woocommerce' ) . '</p>';
+				echo '<p class="woocommerce-error">' . __( 'Please enter a valid order email', 'woocommerce' ) . '</p>';
 
 			} else {
 
@@ -73,7 +73,7 @@ class WC_Shortcode_Order_Tracking {
 
 				} else {
 
-					echo '<p class="woocommerce_error">' . sprintf( __( 'Sorry, we could not find that order id in our database.', 'woocommerce' ), get_permalink($post->ID ) ) . '</p>';
+					echo '<p class="woocommerce-error">' . sprintf( __( 'Sorry, we could not find that order id in our database.', 'woocommerce' ), get_permalink($post->ID ) ) . '</p>';
 
 				}
 
diff --git a/classes/shortcodes/class-wc-shortcode-view-order.php b/classes/shortcodes/class-wc-shortcode-view-order.php
index 96ad2679057..be471a4cbc8 100644
--- a/classes/shortcodes/class-wc-shortcode-view-order.php
+++ b/classes/shortcodes/class-wc-shortcode-view-order.php
@@ -46,7 +46,7 @@ class WC_Shortcode_View_Order {
 		}
 
 		if ( $order->user_id != $user_id ) {
-			echo '<div class="woocommerce_error">' . __( 'Invalid order.', 'woocommerce' ) . ' <a href="'.get_permalink( woocommerce_get_page_id('myaccount') ).'">'. __( 'My Account &rarr;', 'woocommerce' ) .'</a>' . '</div>';
+			echo '<div class="woocommerce-error">' . __( 'Invalid order.', 'woocommerce' ) . ' <a href="'.get_permalink( woocommerce_get_page_id('myaccount') ).'">'. __( 'My Account &rarr;', 'woocommerce' ) .'</a>' . '</div>';
 			return;
 		}
 
diff --git a/classes/widgets/class-wc-widget-login.php b/classes/widgets/class-wc-widget-login.php
index aa473eee475..fdd620c7861 100644
--- a/classes/widgets/class-wc-widget-login.php
+++ b/classes/widgets/class-wc-widget-login.php
@@ -104,7 +104,7 @@ class WC_Widget_Login extends WP_Widget {
 			global $login_errors;
 
 			if ( is_wp_error($login_errors) && $login_errors->get_error_code() ) foreach ($login_errors->get_error_messages() as $error) :
-				echo '<div class="woocommerce_error">' . esc_html( $error ) . "</div>\n";
+				echo '<div class="woocommerce-error">' . esc_html( $error ) . "</div>\n";
 				break;
 			endforeach;
 
diff --git a/templates/cart/totals.php b/templates/cart/totals.php
index 9c307ba9c63..47e003f4aef 100644
--- a/templates/cart/totals.php
+++ b/templates/cart/totals.php
@@ -170,7 +170,7 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
 
 		<?php if ( ! $woocommerce->customer->get_shipping_state() || ! $woocommerce->customer->get_shipping_postcode() ) : ?>
 
-			<div class="woocommerce_info">
+			<div class="woocommerce-info">
 
 				<p><?php _e( 'No shipping methods were found; please recalculate your shipping and enter your state/county and zip/postcode to ensure there are no other available methods for your location.', 'woocommerce' ); ?></p>
 
@@ -178,7 +178,7 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
 
 		<?php else : ?>
 
-			<div class="woocommerce_error">
+			<div class="woocommerce-error">
 
 				<p><?php printf( __( 'Sorry, it seems that there are no available shipping methods for your location (%s).', 'woocommerce' ), $woocommerce->countries->countries[ $woocommerce->customer->get_shipping_country() ] ); ?></p>
 
diff --git a/templates/checkout/form-coupon.php b/templates/checkout/form-coupon.php
index 40709889358..4ce26b2fccf 100644
--- a/templates/checkout/form-coupon.php
+++ b/templates/checkout/form-coupon.php
@@ -14,7 +14,7 @@ if ( get_option( 'woocommerce_enable_coupons' ) == 'no' || get_option( 'woocomme
 $info_message = apply_filters('woocommerce_checkout_coupon_message', __( 'Have a coupon?', 'woocommerce' ));
 ?>
 
-<p class="woocommerce_info"><?php echo $info_message; ?> <a href="#" class="showcoupon"><?php _e( 'Click here to enter your code', 'woocommerce' ); ?></a></p>
+<p class="woocommerce-info"><?php echo $info_message; ?> <a href="#" class="showcoupon"><?php _e( 'Click here to enter your code', 'woocommerce' ); ?></a></p>
 
 <form class="checkout_coupon" method="post">
 
diff --git a/templates/checkout/form-login.php b/templates/checkout/form-login.php
index f1eb3978e59..8ec56d2ed55 100644
--- a/templates/checkout/form-login.php
+++ b/templates/checkout/form-login.php
@@ -14,7 +14,7 @@ if ( is_user_logged_in()  || ! $checkout->enable_signup ) return;
 $info_message = apply_filters( 'woocommerce_checkout_login_message', __( 'Already registered?', 'woocommerce' ) );
 ?>
 
-<p class="woocommerce_info"><?php echo esc_html( $info_message ); ?> <a href="#" class="showlogin"><?php _e( 'Click here to login', 'woocommerce' ); ?></a></p>
+<p class="woocommerce-info"><?php echo esc_html( $info_message ); ?> <a href="#" class="showlogin"><?php _e( 'Click here to login', 'woocommerce' ); ?></a></p>
 
 <?php
 	woocommerce_login_form(
diff --git a/woocommerce-ajax.php b/woocommerce-ajax.php
index 5c38c460a5f..510cc5105f0 100644
--- a/woocommerce-ajax.php
+++ b/woocommerce-ajax.php
@@ -151,7 +151,7 @@ function woocommerce_ajax_update_order_review() {
 		define( 'WOOCOMMERCE_CHECKOUT', true );
 
 	if ( sizeof( $woocommerce->cart->get_cart() ) == 0 ) {
-		echo '<div class="woocommerce_error">' . __( 'Sorry, your session has expired.', 'woocommerce' ) . ' <a href="' . home_url() . '">' . __( 'Return to homepage &rarr;', 'woocommerce' ) . '</a></div>';
+		echo '<div class="woocommerce-error">' . __( 'Sorry, your session has expired.', 'woocommerce' ) . ' <a href="' . home_url() . '">' . __( 'Return to homepage &rarr;', 'woocommerce' ) . '</a></div>';
 		die();
 	}