killbill-uncached

diff --git a/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java b/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java
index 650fb3f..412d239 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java
@@ -49,7 +49,7 @@ import com.google.inject.Inject;
 public class AnalyticsListener {
 
     private final BusinessSubscriptionTransitionRecorder bstRecorder;
-    private final BusinessAccountRecorder bacRecorder;
+    private final BusinessAccountDao bacDao;
     private final BusinessInvoiceDao invoiceDao;
     private final BusinessOverdueStatusRecorder bosRecorder;
     private final BusinessInvoicePaymentDao bipDao;
@@ -58,14 +58,14 @@ public class AnalyticsListener {
 
     @Inject
     public AnalyticsListener(final BusinessSubscriptionTransitionRecorder bstRecorder,
-                             final BusinessAccountRecorder bacRecorder,
+                             final BusinessAccountDao bacDao,
                              final BusinessInvoiceDao invoiceDao,
                              final BusinessOverdueStatusRecorder bosRecorder,
                              final BusinessInvoicePaymentDao bipDao,
                              final BusinessTagRecorder tagRecorder,
                              final InternalCallContextFactory internalCallContextFactory) {
         this.bstRecorder = bstRecorder;
-        this.bacRecorder = bacRecorder;
+        this.bacDao = bacDao;
         this.invoiceDao = invoiceDao;
         this.bosRecorder = bosRecorder;
         this.bipDao = bipDao;
@@ -93,7 +93,7 @@ public class AnalyticsListener {
 
     @Subscribe
     public void handleAccountCreation(final AccountCreationEvent event) {
-        bacRecorder.accountCreated(event.getData(), createCallContext(event));
+        bacDao.accountCreated(event.getData(), createCallContext(event));
     }
 
     @Subscribe
@@ -102,7 +102,7 @@ public class AnalyticsListener {
             return;
         }
 
-        bacRecorder.accountUpdated(event.getAccountId(), createCallContext(event));
+        bacDao.accountUpdated(event.getAccountId(), createCallContext(event));
     }
 
     @Subscribe

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java
index 9b20ba1..cad45b5 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java
@@ -61,7 +61,7 @@ public class BusinessInvoiceDao {
     private final AccountInternalApi accountApi;
     private final EntitlementInternalApi entitlementApi;
     private final InvoiceInternalApi invoiceApi;
-    private final BusinessAccountRecorder businessAccountRecorder;
+    private final BusinessAccountDao businessAccountDao;
     private final BusinessInvoiceSqlDao sqlDao;
     private final CatalogService catalogService;
 
@@ -69,13 +69,13 @@ public class BusinessInvoiceDao {
     public BusinessInvoiceDao(final AccountInternalApi accountApi,
                               final EntitlementInternalApi entitlementApi,
                               final InvoiceInternalApi invoiceApi,
-                              final BusinessAccountRecorder businessAccountRecorder,
+                              final BusinessAccountDao businessAccountDao,
                               final BusinessInvoiceSqlDao sqlDao,
                               final CatalogService catalogService) {
         this.accountApi = accountApi;
         this.entitlementApi = entitlementApi;
         this.invoiceApi = invoiceApi;
-        this.businessAccountRecorder = businessAccountRecorder;
+        this.businessAccountDao = businessAccountDao;
         this.sqlDao = sqlDao;
         this.catalogService = catalogService;
     }
@@ -117,7 +117,7 @@ public class BusinessInvoiceDao {
 
                 // Update balance, last invoice date and total invoice balance in BAC
                 final BusinessAccountSqlDao accountSqlDao = transactional.become(BusinessAccountSqlDao.class);
-                businessAccountRecorder.updateAccountInTransaction(account, accountSqlDao, context);
+                businessAccountDao.updateAccountInTransaction(account, accountSqlDao, context);
                 return null;
             }
         });

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
index 97a397b..17be9a6 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
@@ -57,12 +57,12 @@ public class BusinessInvoicePaymentDao {
     private final PaymentApi paymentApi;
     private final Clock clock;
     private final BusinessInvoiceDao invoiceDao;
-    private final BusinessAccountRecorder accountRecorder;
+    private final BusinessAccountDao accountDao;
 
     @Inject
     public BusinessInvoicePaymentDao(final BusinessInvoicePaymentSqlDao invoicePaymentSqlDao, final AccountInternalApi accountApi,
                                      final InvoicePaymentApi invoicePaymentApi, final InvoiceInternalApi invoiceApi, final PaymentApi paymentApi,
-                                     final Clock clock, final BusinessInvoiceDao invoiceDao, final BusinessAccountRecorder accountRecorder) {
+                                     final Clock clock, final BusinessInvoiceDao invoiceDao, final BusinessAccountDao accountDao) {
         this.invoicePaymentSqlDao = invoicePaymentSqlDao;
         this.accountApi = accountApi;
         this.invoicePaymentApi = invoicePaymentApi;
@@ -70,7 +70,7 @@ public class BusinessInvoicePaymentDao {
         this.paymentApi = paymentApi;
         this.clock = clock;
         this.invoiceDao = invoiceDao;
-        this.accountRecorder = accountRecorder;
+        this.accountDao = accountDao;
     }
 
     public void invoicePaymentPosted(final UUID accountId, @Nullable final UUID paymentId, @Nullable final String extFirstPaymentRefId,
@@ -176,7 +176,7 @@ public class BusinessInvoicePaymentDao {
 
                 // Update bac to get the latest account balance, total invoice balance, etc.
                 final BusinessAccountSqlDao accountSqlDao = transactional.become(BusinessAccountSqlDao.class);
-                accountRecorder.updateAccountInTransaction(account, accountSqlDao, context);
+                accountDao.updateAccountInTransaction(account, accountSqlDao, context);
 
                 log.info("Added payment {}", businessInvoicePayment);
                 return null;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
index 1f4e3c9..8467c83 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
@@ -17,7 +17,7 @@
 package com.ning.billing.analytics.setup;
 
 import com.ning.billing.analytics.AnalyticsListener;
-import com.ning.billing.analytics.BusinessAccountRecorder;
+import com.ning.billing.analytics.BusinessAccountDao;
 import com.ning.billing.analytics.BusinessSubscriptionTransitionRecorder;
 import com.ning.billing.analytics.BusinessTagRecorder;
 import com.ning.billing.analytics.api.AnalyticsService;
@@ -62,7 +62,7 @@ public class AnalyticsModule extends AbstractModule {
         bind(BusinessSubscriptionTransitionTagSqlDao.class).toProvider(new BusinessSqlProvider<BusinessSubscriptionTransitionTagSqlDao>(BusinessSubscriptionTransitionTagSqlDao.class));
 
         bind(BusinessSubscriptionTransitionRecorder.class).asEagerSingleton();
-        bind(BusinessAccountRecorder.class).asEagerSingleton();
+        bind(BusinessAccountDao.class).asEagerSingleton();
         bind(BusinessTagRecorder.class).asEagerSingleton();
         bind(AnalyticsListener.class).asEagerSingleton();
 

diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessInvoiceRecorder.java b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessInvoiceRecorder.java
index 25d5e01..ceebb20 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessInvoiceRecorder.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessInvoiceRecorder.java
@@ -40,7 +40,7 @@ public class TestBusinessInvoiceRecorder extends AnalyticsTestSuite {
     private final AccountInternalApi accountApi = Mockito.mock(AccountInternalApi.class);
     private final EntitlementInternalApi entitlementApi = Mockito.mock(EntitlementInternalApi.class);
     private final InvoiceInternalApi invoiceApi = Mockito.mock(InvoiceInternalApi.class);
-    private final BusinessAccountRecorder bacDao = Mockito.mock(BusinessAccountRecorder.class);
+    private final BusinessAccountDao bacDao = Mockito.mock(BusinessAccountDao.class);
     private final BusinessInvoiceSqlDao sqlDao = Mockito.mock(BusinessInvoiceSqlDao.class);
 
     @Test(groups = "fast")