killbill-uncached

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/IEntitlementUserApi.java b/api/src/main/java/com/ning/billing/entitlement/api/user/IEntitlementUserApi.java
index ef5c729..fb21eea 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/IEntitlementUserApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/IEntitlementUserApi.java
@@ -35,7 +35,7 @@ public interface IEntitlementUserApi {
 
     public List<ISubscription> getSubscriptionsForBundle(UUID bundleId);
 
-    public ISubscriptionBundle createBundleForAccount(IAccount account, String bundleName)
+    public ISubscriptionBundle createBundleForAccount(IAccount account, String bundleKey)
         throws EntitlementUserApiException;
 
     public ISubscription createSubscription(UUID bundleId, String productName, BillingPeriod term, String planSet)

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/ISubscriptionBundle.java b/api/src/main/java/com/ning/billing/entitlement/api/user/ISubscriptionBundle.java
index 7689cc3..58d3ddf 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/ISubscriptionBundle.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/ISubscriptionBundle.java
@@ -26,9 +26,9 @@ public interface ISubscriptionBundle extends IPrivateFields {
 
     public UUID getAccountId();
 
-    public String getName();
-
     public UUID getId();
 
     public DateTime getStartDate();
+
+    public String getKey();
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
index b62de56..cc990a9 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionBundle.java
@@ -27,7 +27,7 @@ import com.ning.billing.entitlement.events.user.ApiEventCreate;
 public class SubscriptionBundle extends PrivateFields implements ISubscriptionBundle {
 
     private final UUID id;
-    private final String name;
+    private final String key;
     private final UUID accountId;
     private final DateTime startDate;
 
@@ -35,17 +35,17 @@ public class SubscriptionBundle extends PrivateFields implements ISubscriptionBu
         this(UUID.randomUUID(), name, accountId, null);
     }
 
-    public SubscriptionBundle(UUID id, String name, UUID accountId, DateTime startDate) {
+    public SubscriptionBundle(UUID id, String key, UUID accountId, DateTime startDate) {
         super();
         this.id = id;
-        this.name = name;
+        this.key = key;
         this.accountId = accountId;
         this.startDate = startDate;
     }
 
     @Override
-    public String getName() {
-        return name;
+    public String getKey() {
+        return key;
     }
 
     @Override