killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
index f33f284..fe81d21 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
@@ -152,7 +152,7 @@ public class AccountJson extends JsonBase {
         this.accountCBA = accountCBA;
     }
 
-    public Account toAccountData(@Nullable final UUID accountId) {
+    public Account toAccount(@Nullable final UUID accountId) {
         return new Account() {
 
             @Override

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
index 8d36405..b9ab2f0 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
@@ -354,7 +354,7 @@ public class AccountResource extends JaxRsResourceBase {
                                   @javax.ws.rs.core.Context final UriInfo uriInfo) throws AccountApiException {
         verifyNonNullOrEmpty(json, "AccountJson body should be specified");
 
-        final AccountData data = json.toAccountData(null);
+        final AccountData data = json.toAccount(null);
         final Account account = accountUserApi.createAccount(data, context.createContext(createdBy, reason, comment, request));
         return uriBuilder.buildResponse(uriInfo, AccountResource.class, "getAccount", account.getId(), request);
     }
@@ -376,7 +376,7 @@ public class AccountResource extends JaxRsResourceBase {
         verifyNonNullOrEmpty(json, "AccountJson body should be specified");
 
         final UUID uuid = UUID.fromString(accountId);
-        final Account data = json.toAccountData(uuid);
+        final Account data = json.toAccount(uuid);
         if (treatNullValueAsReset) {
             accountUserApi.updateAccount(data, context.createContext(createdBy, reason, comment, request));
         } else {

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ComboPaymentResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ComboPaymentResource.java
index 0182647..b2299ad 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ComboPaymentResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ComboPaymentResource.java
@@ -76,7 +76,7 @@ public abstract class ComboPaymentResource extends JaxRsResourceBase {
             }
         }
         // Finally create if does not exist
-        return accountUserApi.createAccount(accountJson.toAccountData(null), callContext);
+        return accountUserApi.createAccount(accountJson.toAccount(null), callContext);
     }
 
     protected UUID getOrCreatePaymentMethod(final Account account, final PaymentMethodJson paymentMethodJson, final Iterable<PluginProperty> pluginProperties, final CallContext callContext) throws PaymentApiException {