killbill-uncached

diff --git a/api/src/main/java/com/ning/billing/entitlement/EventsStream.java b/api/src/main/java/com/ning/billing/entitlement/EventsStream.java
index 8cb930f..70f54ef 100644
--- a/api/src/main/java/com/ning/billing/entitlement/EventsStream.java
+++ b/api/src/main/java/com/ning/billing/entitlement/EventsStream.java
@@ -44,9 +44,9 @@ public interface EventsStream {
 
     LocalDate getEntitlementEffectiveEndDate();
 
-    SubscriptionBase getSubscription();
+    SubscriptionBase getSubscriptionBase();
 
-    SubscriptionBase getBaseSubscription();
+    SubscriptionBase getBasePlanSubscriptionBase();
 
     boolean isEntitlementActive();
 

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlement.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlement.java
index 102806e..703d20c 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlement.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlement.java
@@ -88,7 +88,7 @@ public class DefaultEntitlement extends EntityBase implements Entitlement {
                               final SubscriptionBaseInternalApi subscriptionInternalApi, final BlockingChecker checker,
                               final NotificationQueueService notificationQueueService, final EntitlementUtils entitlementUtils,
                               final EntitlementDateHelper dateHelper, final Clock clock, final InternalCallContextFactory internalCallContextFactory) {
-        super(eventsStream.getEntitlementId(), eventsStream.getSubscription().getCreatedDate(), eventsStream.getSubscription().getUpdatedDate());
+        super(eventsStream.getEntitlementId(), eventsStream.getSubscriptionBase().getCreatedDate(), eventsStream.getSubscriptionBase().getUpdatedDate());
         this.eventsStreamBuilder = eventsStreamBuilder;
         this.eventsStream = eventsStream;
         this.dateHelper = dateHelper;
@@ -126,12 +126,12 @@ public class DefaultEntitlement extends EntityBase implements Entitlement {
 
     // Subscription associated with this entitlement (equals to baseSubscription for base subscriptions)
     public SubscriptionBase getSubscriptionBase() {
-        return eventsStream.getSubscription();
+        return eventsStream.getSubscriptionBase();
     }
 
     // Base subscription for the bundle if it exists, null otherwise
-    public SubscriptionBase getBaseSubscription() {
-        return eventsStream.getBaseSubscription();
+    public SubscriptionBase getBasePlanSubscriptionBase() {
+        return eventsStream.getBasePlanSubscriptionBase();
     }
 
     public EventsStreamBuilder getEventsStreamBuilder() {

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java
index dfd9cd6..a1b3deb 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java
@@ -144,7 +144,7 @@ public class DefaultEntitlementApi implements EntitlementApi {
             throw new EntitlementApiException(new BlockingApiException(ErrorCode.BLOCK_BLOCKED_ACTION, BlockingChecker.ACTION_CHANGE, BlockingChecker.TYPE_SUBSCRIPTION, eventsStreamForBaseSubscription.getEntitlementId().toString()));
         }
 
-        final DateTime requestedDate = dateHelper.fromLocalDateAndReferenceTime(effectiveDate, eventsStreamForBaseSubscription.getSubscription().getStartDate(), eventsStreamForBaseSubscription.getInternalTenantContext());
+        final DateTime requestedDate = dateHelper.fromLocalDateAndReferenceTime(effectiveDate, eventsStreamForBaseSubscription.getSubscriptionBase().getStartDate(), eventsStreamForBaseSubscription.getInternalTenantContext());
 
         try {
             final InternalCallContext context = internalCallContextFactory.createInternalCallContext(callContext);

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscription.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscription.java
index 35bc11c..27f4601 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscription.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscription.java
@@ -42,10 +42,10 @@ public class DefaultSubscription extends DefaultEntitlement implements Subscript
     public LocalDate getBillingEndDate() {
         final DateTime futureOrCurrentEndDateForSubscription = getSubscriptionBase().getEndDate() != null ? getSubscriptionBase().getEndDate() : getSubscriptionBase().getFutureEndDate();
         final DateTime futureOrCurrentEndDateForBaseSubscription;
-        if (getBaseSubscription() == null) {
+        if (getBasePlanSubscriptionBase() == null) {
             futureOrCurrentEndDateForBaseSubscription = null;
         } else {
-            futureOrCurrentEndDateForBaseSubscription = getBaseSubscription().getEndDate() != null ? getBaseSubscription().getEndDate() : getBaseSubscription().getFutureEndDate();
+            futureOrCurrentEndDateForBaseSubscription = getBasePlanSubscriptionBase().getEndDate() != null ? getBasePlanSubscriptionBase().getEndDate() : getBasePlanSubscriptionBase().getFutureEndDate();
         }
 
         final DateTime futureOrCurrentEndDate;

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/dao/ProxyBlockingStateDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/dao/ProxyBlockingStateDao.java
index bef2260..1fc3b77 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/dao/ProxyBlockingStateDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/dao/ProxyBlockingStateDao.java
@@ -296,7 +296,7 @@ public class ProxyBlockingStateDao implements BlockingStateDao {
                                                                            new Predicate<EventsStream>() {
                                                                                @Override
                                                                                public boolean apply(final EventsStream input) {
-                                                                                   return input.getSubscription().getId().equals(baseSubscription.getId());
+                                                                                   return input.getSubscriptionBase().getId().equals(baseSubscription.getId());
                                                                                }
                                                                            });
 

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/DefaultEventsStream.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/DefaultEventsStream.java
index 1b28830..fe78ed6 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/DefaultEventsStream.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/DefaultEventsStream.java
@@ -123,12 +123,12 @@ public class DefaultEventsStream implements EventsStream {
     }
 
     @Override
-    public SubscriptionBase getBaseSubscription() {
+    public SubscriptionBase getBasePlanSubscriptionBase() {
         return baseSubscription;
     }
 
     @Override
-    public SubscriptionBase getSubscription() {
+    public SubscriptionBase getSubscriptionBase() {
         return subscription;
     }
 

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/TestEntitlementUtils.java b/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/TestEntitlementUtils.java
index 034a147..13be1fe 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/TestEntitlementUtils.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/engine/core/TestEntitlementUtils.java
@@ -449,7 +449,7 @@ public class TestEntitlementUtils extends EntitlementTestSuiteWithEmbeddedDB {
                                                                        new Predicate<EventsStream>() {
                                                                            @Override
                                                                            public boolean apply(final EventsStream input) {
-                                                                               return input.getSubscription().getId().equals(baseEntitlement.getId());
+                                                                               return input.getSubscriptionBase().getId().equals(baseEntitlement.getId());
                                                                            }
                                                                        });
         return eventsStream.computeAddonsBlockingStatesForFutureSubscriptionBaseEvents();
@@ -466,7 +466,7 @@ public class TestEntitlementUtils extends EntitlementTestSuiteWithEmbeddedDB {
                                                                        new Predicate<EventsStream>() {
                                                                            @Override
                                                                            public boolean apply(final EventsStream input) {
-                                                                               return input.getSubscription().getId().equals(baseEntitlement.getId());
+                                                                               return input.getSubscriptionBase().getId().equals(baseEntitlement.getId());
                                                                            }
                                                                        });
         return eventsStream.computeAddonsBlockingStatesForNextSubscriptionBaseEvent(effectiveDate);