diff --git a/uc_order/tests/uc_order.test b/uc_order/tests/uc_order.test
index 8b4d651..89a14aa 100644
--- a/uc_order/tests/uc_order.test
+++ b/uc_order/tests/uc_order.test
@@ -24,6 +24,11 @@ class UbercartOrderTestCase extends UbercartTestHelper {
     $order = uc_order_new($this->customer->uid, 'completed');
     $this->assertEqual($order->uid, $this->customer->uid, 'New order has correct uid.');
     $this->assertEqual($order->order_status, 'completed', 'New order is marked completed.');
+
+    // Test deletion.
+    uc_order_delete($order->order_id);
+    $deleted_order = uc_order_load($order->order_id, TRUE);
+    $this->assertFalse($deleted_order, 'Order was successfully deleted');
   }
 
   public function testOrderEntity() {
@@ -42,6 +47,11 @@ class UbercartOrderTestCase extends UbercartTestHelper {
     $this->assertEqual($order->order_status, 'completed', 'New order is marked completed.');
     $this->assertEqual($order->billing_first_name, $name, 'New order has correct name.');
     $this->assertEqual($order->billing_last_name, $name, 'New order has correct name.');
+
+    // Test deletion.
+    entity_delete('uc_order', $order->order_id);
+    $deleted_order = entity_load('uc_order', array($order->order_id), array(), TRUE);
+    $this->assertFalse($deleted_order, 'Order was successfully deleted');
   }
 
   public function testOrderCreation() {
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index 54dff88..6822f02 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -476,7 +476,7 @@ function uc_order_entity_info() {
       'access callback'   => 'uc_order_order_entity_access',
       'creation callback' => 'uc_order_create',
       'save callback'     => 'uc_order_save',
-      'delete callback'   => 'uc_order_delete',
+      'deletion callback' => 'uc_order_delete',
     ),
     'uc_order_product' => array(
       'label' => t('Order product'),
@@ -501,9 +501,9 @@ function uc_order_entity_info() {
         ),
       ),
       // Entity API callbacks.
-      'access callback' => 'uc_order_order_product_access',
-      'save callback'   => 'uc_order_product_entity_save',
-      'delete callback' => 'uc_order_product_delete',
+      'access callback'   => 'uc_order_order_product_access',
+      'save callback'     => 'uc_order_product_entity_save',
+      'deletion callback' => 'uc_order_product_delete',
     ),
   );
 }
@@ -922,7 +922,7 @@ function uc_order_save($order) {
 }
 
 /**
- * Entity API "delete callback" for uc_order entity.
+ * Entity API "deletion callback" for uc_order entity.
  *
  * Deletes an order and tells other modules to do the same.
  *
@@ -1024,7 +1024,7 @@ function uc_order_product_entity_save($product) {
 }
 
 /**
- * Entity API "delete callback" for uc_order_product entity.
+ * Entity API "deletion callback" for uc_order_product entity.
  *
  * Removes a product from an order.
  */