diff --git a/modules/customer/includes/commerce_customer.entity.inc b/modules/customer/includes/commerce_customer.entity.inc
index 020f45c6..f358c6b6 100644
--- a/modules/customer/includes/commerce_customer.entity.inc
+++ b/modules/customer/includes/commerce_customer.entity.inc
@@ -6,7 +6,6 @@
 class CommerceCustomerProfile extends Entity {
 
   public $langcode = LANGUAGE_NONE;
-  public $name = '';
 
   public function __construct($values = array()) {
     parent::__construct($values, 'commerce_customer_profile');
@@ -21,7 +20,7 @@ class CommerceCustomerProfile extends Entity {
   }
 
   public function label() {
-    return $this->name;
+    return "Customer Profile (uid {$this->uid})";
   }
 
   public function uri() {
diff --git a/modules/line_item/includes/commerce_line_item.entity.inc b/modules/line_item/includes/commerce_line_item.entity.inc
index 804a5ab2..0c18da1f 100644
--- a/modules/line_item/includes/commerce_line_item.entity.inc
+++ b/modules/line_item/includes/commerce_line_item.entity.inc
@@ -20,7 +20,7 @@ class CommerceLineItem extends Entity {
   }
 
   public function label() {
-    return $this->name;
+    return $this->line_item_id;
   }
 
   public function uri() {
diff --git a/modules/payment/includes/commerce_payment_transaction.entity.inc b/modules/payment/includes/commerce_payment_transaction.entity.inc
index dd4710d6..c7d283b4 100644
--- a/modules/payment/includes/commerce_payment_transaction.entity.inc
+++ b/modules/payment/includes/commerce_payment_transaction.entity.inc
@@ -20,7 +20,7 @@ class CommercePaymentTransaction extends Entity {
   }
 
   public function label() {
-    return $this->name;
+    return $this->transaction_id;
   }
 
   public function uri() {
diff --git a/modules/product/includes/commerce_product.entity.inc b/modules/product/includes/commerce_product.entity.inc
index 9f8f443a..5315e47d 100644
--- a/modules/product/includes/commerce_product.entity.inc
+++ b/modules/product/includes/commerce_product.entity.inc
@@ -20,7 +20,7 @@ class CommerceProduct extends Entity {
   }
 
   public function label() {
-    return $this->name;
+    return $this->title;
   }
 
   public function uri() {