killbill-uncached

Details

diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java
index 1f88513..5b6d422 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java
@@ -23,7 +23,6 @@ import javax.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.catalog.api.Currency;
-import org.killbill.billing.entity.EntityBase;
 import org.killbill.billing.payment.api.PaymentTransaction;
 import org.killbill.billing.payment.api.TransactionStatus;
 import org.killbill.billing.payment.api.TransactionType;
@@ -244,11 +243,11 @@ public class PaymentTransactionModelDao extends EntityModelDaoBase implements En
 
     @Override
     public TableName getTableName() {
-        return TableName.TRANSACTIONS;
+        return TableName.PAYMENT_TRANSACTIONS;
     }
 
     @Override
     public TableName getHistoryTableName() {
-        return TableName.TRANSACTION_HISTORY;
+        return TableName.PAYMENT_TRANSACTION_HISTORY;
     }
 }
diff --git a/util/src/main/java/org/killbill/billing/util/dao/TableName.java b/util/src/main/java/org/killbill/billing/util/dao/TableName.java
index 54edeb3..a7edf11 100644
--- a/util/src/main/java/org/killbill/billing/util/dao/TableName.java
+++ b/util/src/main/java/org/killbill/billing/util/dao/TableName.java
@@ -41,8 +41,8 @@ public enum TableName {
     PAYMENTS("payments", ObjectType.PAYMENT, PAYMENT_HISTORY),
     PAYMENT_METHOD_HISTORY("payment_method_history"),
     PAYMENT_METHODS("payment_methods", ObjectType.PAYMENT_METHOD, PAYMENT_METHOD_HISTORY),
-    TRANSACTION_HISTORY("payment_transaction_history"),
-    TRANSACTIONS("payment_transactions", ObjectType.TRANSACTION, TRANSACTION_HISTORY),
+    PAYMENT_TRANSACTION_HISTORY("payment_transaction_history"),
+    PAYMENT_TRANSACTIONS("payment_transactions", ObjectType.TRANSACTION, PAYMENT_TRANSACTION_HISTORY),
     SUBSCRIPTIONS("subscriptions", ObjectType.SUBSCRIPTION),
     SUBSCRIPTION_EVENTS("subscription_events", ObjectType.SUBSCRIPTION_EVENT),
     REFUND_HISTORY("refund_history"),