diff --git a/classes/product.class.php b/classes/product.class.php
index be3e40991ba..7d8f9813534 100644
--- a/classes/product.class.php
+++ b/classes/product.class.php
@@ -192,7 +192,7 @@ class woocommerce_product {
 	}
 	
 	/** Returns whether or not the product has any child product */
-	function has_child () {
+	function has_child() {
 		return sizeof($this->children) ? true : false;
 	}
 	
diff --git a/shortcodes/shortcode-cart.php b/shortcodes/shortcode-cart.php
index c25473bf518..34c2d54a792 100644
--- a/shortcodes/shortcode-cart.php
+++ b/shortcodes/shortcode-cart.php
@@ -71,7 +71,7 @@ function woocommerce_cart( $atts ) {
 	
 	if (sizeof($woocommerce->cart->cart_contents)==0) :
 		echo '<p>'.__('Your cart is currently empty.', 'woothemes').'</p>';
-		do_action('woocommerce_empty_cart');
+		do_action('woocommerce_cart_is_empty');
 		echo '<p><a class="button" href="'.get_permalink(get_option('woocommerce_shop_page_id')).'">'.__('&larr; Return To Shop', 'woothemes').'</a></p>';
 		return;
 	endif;
@@ -129,7 +129,7 @@ function woocommerce_cart( $atts ) {
 				endforeach; 
 			endif;
 			
-			do_action( 'woocommerce_shop_table_cart' );
+			do_action( 'woocommerce_cart_contents' );
 			?>
 			<tr>
 				<td colspan="6" class="actions">
@@ -145,7 +145,7 @@ function woocommerce_cart( $atts ) {
 	</form>
 	<div class="cart-collaterals">
 		
-		<?php do_action('cart-collaterals'); ?>
+		<?php do_action('woocommerce_cart_collaterals'); ?>
 		
 		<?php woocommerce_cart_totals(); ?>
 		
diff --git a/templates/checkout/form.php b/templates/checkout/form.php
index 06955cdb5dc..3cf3b29717b 100644
--- a/templates/checkout/form.php
+++ b/templates/checkout/form.php
@@ -1,4 +1,4 @@
-<?php do_action('before_checkout_form');
+<?php do_action('woocommerce_before_checkout_form');
 
 global $woocommerce;
 
@@ -26,4 +26,4 @@ $get_checkout_url = apply_filters( 'woocommerce_get_checkout_url', $woocommerce-
 	
 </form>
 
-<?php do_action('after_checkout_form'); ?>
\ No newline at end of file
+<?php do_action('woocommerce_after_checkout_form'); ?>
\ No newline at end of file
diff --git a/templates/single-product.php b/templates/single-product.php
index 7fa386c56a1..a5e9cc5b29a 100644
--- a/templates/single-product.php
+++ b/templates/single-product.php
@@ -14,7 +14,7 @@
 				
 				<h1 class="product_title page-title"><?php the_title(); ?></h1>
 				
-				<?php do_action( 'woocommerce_template_single_summary', $post, $_product ); ?>
+				<?php do_action( 'woocommerce_single_product_summary', $post, $_product ); ?>
 	
 			</div>
 			
diff --git a/woocommerce_template_actions.php b/woocommerce_template_actions.php
index 21fbad44c9b..2dc8b9f348e 100644
--- a/woocommerce_template_actions.php
+++ b/woocommerce_template_actions.php
@@ -40,16 +40,16 @@ add_action( 'woocommerce_after_single_product_summary', 'woocommerce_output_prod
 add_action( 'woocommerce_after_single_product_summary', 'woocommerce_output_related_products', 20);
 
 /* Product Summary Box */
-add_action( 'woocommerce_template_single_summary', 'woocommerce_template_single_price', 10, 2);
-add_action( 'woocommerce_template_single_summary', 'woocommerce_template_single_excerpt', 20, 2);
-add_action( 'woocommerce_template_single_summary', 'woocommerce_template_single_meta', 40, 2);
-add_action( 'woocommerce_template_single_summary', 'woocommerce_template_single_sharing', 50, 2);
+add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_price', 10, 2);
+add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_excerpt', 20, 2);
+add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_meta', 40, 2);
+add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_sharing', 50, 2);
 
 /* After Single Products */
 add_action('woocommerce_after_single_product', 'woocommerce_upsell_display');
 
 /* Product Add to cart */
-add_action( 'woocommerce_template_single_summary', 'woocommerce_template_single_add_to_cart', 30, 2 );
+add_action( 'woocommerce_single_product_summary', 'woocommerce_template_single_add_to_cart', 30, 2 );
 add_action( 'simple_add_to_cart', 'woocommerce_simple_add_to_cart' ); 
 add_action( 'virtual_add_to_cart', 'woocommerce_simple_add_to_cart' ); 
 add_action( 'downloadable_add_to_cart', 'woocommerce_downloadable_add_to_cart' ); 
@@ -73,7 +73,7 @@ add_action( 'woocommerce_product_tab_panels', 'woocommerce_product_attributes_pa
 add_action( 'woocommerce_product_tab_panels', 'woocommerce_product_reviews_panel', 30 );
 
 /* Checkout */
-add_action( 'before_checkout_form', 'woocommerce_checkout_login_form', 10 );
+add_action( 'woocommerce_before_checkout_form', 'woocommerce_checkout_login_form', 10 );
 add_action( 'woocommerce_checkout_order_review', 'woocommerce_order_review', 10 );
 
 /* Remove the singular class for woocommerce single product */
@@ -84,7 +84,7 @@ function woocommerce_body_classes_check () {
 }
 
 /* Cart */
-add_action('cart-collaterals', 'woocommerce_cross_sell_display');
+add_action('woocommerce_cart_collaterals', 'woocommerce_cross_sell_display');
 
 /* Footer */
 add_action( 'wp_footer', 'woocommerce_demo_store' );