killbill-aplcache

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountHistorySqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountHistorySqlDao.java
index 8d1a46e..6ae95e2 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountHistorySqlDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountHistorySqlDao.java
@@ -28,7 +28,7 @@ import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTempla
 public interface AccountHistorySqlDao extends Transmogrifier {
     @SqlUpdate
     public void insertAccountHistoryFromTransaction(@AccountBinder final Account account,
-                                                    @Bind("historyId") final String historyId,
+                                                    @Bind("historyRecordId") final String historyRecordId,
                                                     @Bind("changeType") String changeType,
                                                     @CallContextBinder CallContext context);
 }

diff --git a/account/src/main/resources/com/ning/billing/account/dao/AccountHistorySqlDao.sql.stg b/account/src/main/resources/com/ning/billing/account/dao/AccountHistorySqlDao.sql.stg
index c64c29f..069f994 100644
--- a/account/src/main/resources/com/ning/billing/account/dao/AccountHistorySqlDao.sql.stg
+++ b/account/src/main/resources/com/ning/billing/account/dao/AccountHistorySqlDao.sql.stg
@@ -2,12 +2,12 @@ group AccountHistorySqlDao;
 
 insertAccountHistoryFromTransaction() ::= <<
     INSERT INTO account_history
-    (history_id, id, external_key, email, name, first_name_length, currency,
+    (history_record_id, id, external_key, email, name, first_name_length, currency,
     billing_cycle_day, payment_provider_name, time_zone, locale,
     address1, address2, company_name, city, state_or_province,
     country, postal_code, phone, change_type, updated_by, date)
     VALUES
-    (:historyId, :id, :externalKey, :email, :name, :firstNameLength, :currency,
+    (:historyRecordId, :id, :externalKey, :email, :name, :firstNameLength, :currency,
      :billingCycleDay, :paymentProviderName, :timeZone, :locale,
      :address1, :address2, :companyName, :city, :stateOrProvince,
      :country, :postalCode, :phone, :changeType, :userName, :createdDate);

diff --git a/account/src/main/resources/com/ning/billing/account/ddl.sql b/account/src/main/resources/com/ning/billing/account/ddl.sql
index 696133a..50f3e3f 100644
--- a/account/src/main/resources/com/ning/billing/account/ddl.sql
+++ b/account/src/main/resources/com/ning/billing/account/ddl.sql
@@ -30,7 +30,7 @@ CREATE UNIQUE INDEX accounts_email ON accounts(email);
 
 DROP TABLE IF EXISTS account_history;
 CREATE TABLE account_history (
-    history_id char(36) NOT NULL,
+    history_record_id char(36) NOT NULL,
     id char(36) NOT NULL,
     external_key varchar(128) NULL,
     email varchar(50) NOT NULL,
@@ -66,7 +66,7 @@ CREATE TABLE account_emails (
     updated_date datetime NOT NULL,
     PRIMARY KEY(id)
 ) ENGINE=innodb;
-CREATE INDEX account_email_account_id ON account_mails(account_id);
+CREATE INDEX account_email_account_id ON account_emails(account_id);
 
 DROP TABLE IF EXISTS account_email_history;
 CREATE TABLE account_email_history (

diff --git a/util/src/main/java/com/ning/billing/util/customfield/CustomFieldHistoryBinder.java b/util/src/main/java/com/ning/billing/util/customfield/CustomFieldHistoryBinder.java
index 51e3621..5d6f6f2 100644
--- a/util/src/main/java/com/ning/billing/util/customfield/CustomFieldHistoryBinder.java
+++ b/util/src/main/java/com/ning/billing/util/customfield/CustomFieldHistoryBinder.java
@@ -37,7 +37,7 @@ public @interface CustomFieldHistoryBinder {
             return new Binder<CustomFieldHistoryBinder, CustomFieldHistory>() {
                 @Override
                 public void bind(SQLStatement q, CustomFieldHistoryBinder bind, CustomFieldHistory customFieldHistory) {
-                    q.bind("historyId", customFieldHistory.getHistoryId().toString());
+                    q.bind("historyRecordId", customFieldHistory.getHistoryId().toString());
                     q.bind("changeType", customFieldHistory.getChangeType().toString());
                     q.bind("id", customFieldHistory.getId().toString());
                     q.bind("fieldName", customFieldHistory.getName());

diff --git a/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldHistorySqlDao.sql.stg b/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldHistorySqlDao.sql.stg
index c9e2ab0..6e5a43f 100644
--- a/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldHistorySqlDao.sql.stg
+++ b/util/src/main/resources/com/ning/billing/util/customfield/dao/CustomFieldHistorySqlDao.sql.stg
@@ -1,7 +1,7 @@
 group CustomFieldHistorySqlDao;
 
 fields(prefix) ::= <<
-  <prefix>history_id,
+  <prefix>history_record_id,
   <prefix>id,
   <prefix>object_id,
   <prefix>object_type,
@@ -14,5 +14,5 @@ fields(prefix) ::= <<
 
 batchAddHistoryFromTransaction() ::= <<
     INSERT INTO custom_field_history(<fields()>)
-    VALUES(:historyId, :id, :objectId, :objectType, :fieldName, :fieldValue, :userName, :updatedDate, :changeType);
+    VALUES(:historyRecordId, :id, :objectId, :objectType, :fieldName, :fieldValue, :userName, :updatedDate, :changeType);
 >>
\ No newline at end of file

diff --git a/util/src/main/resources/com/ning/billing/util/ddl.sql b/util/src/main/resources/com/ning/billing/util/ddl.sql
index 486a031..cf993fa 100644
--- a/util/src/main/resources/com/ning/billing/util/ddl.sql
+++ b/util/src/main/resources/com/ning/billing/util/ddl.sql
@@ -16,7 +16,7 @@ CREATE UNIQUE INDEX custom_fields_unique ON custom_fields(object_id, object_type
 
 DROP TABLE IF EXISTS custom_field_history;
 CREATE TABLE custom_field_history (
-  history_id char(36) NOT NULL,
+  history_record_id char(36) NOT NULL,
   id char(36) NOT NULL,
   object_id char(36) NOT NULL,
   object_type varchar(30) NOT NULL,