killbill-memoizeit

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java
index a1354cb..9fa91e0 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java
@@ -61,7 +61,7 @@ public class PaymentMethodJson {
                 properties = new ArrayList<PaymentMethodJson.PaymentMethodProperties>(Collections2.transform(in.getPluginDetail().getProperties(), new Function<PaymentMethodKVInfo, PaymentMethodProperties>() {
                     @Override
                     public PaymentMethodProperties apply(final PaymentMethodKVInfo input) {
-                        return new PaymentMethodProperties(input.getKey(), input.getValue().toString(), input.getIsUpdatable());
+                        return new PaymentMethodProperties(input.getKey(), input.getValue() == null ? null : input.getValue().toString(), input.getIsUpdatable());
                     }
                 }));
             }

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
index 095df0a..7e22ed1 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
@@ -42,24 +42,24 @@ public interface JaxrsResource {
      * Query parameters
      */
     public static final String QUERY_EXTERNAL_KEY = "external_key";
-    public static final String QUERY_REQUESTED_DT = "requested_date";
-    public static final String QUERY_CALL_COMPLETION = "call_completion";
-    public static final String QUERY_CALL_TIMEOUT = "call_timeout_sec";
-    public static final String QUERY_DRY_RUN = "dry_run";
-    public static final String QUERY_TARGET_DATE = "target_date";
+    public static final String QUERY_REQUESTED_DT = "requestedDate";
+    public static final String QUERY_CALL_COMPLETION = "callCompletion";
+    public static final String QUERY_CALL_TIMEOUT = "callTimeoutSec";
+    public static final String QUERY_DRY_RUN = "dryRun";
+    public static final String QUERY_TARGET_DATE = "targetDate";
     public static final String QUERY_POLICY = "policy";
 
-    public static final String QUERY_ACCOUNT_ID = "account_id";
+    public static final String QUERY_ACCOUNT_ID = "accountId";
 
-    public static final String QUERY_PAYMENT_EXTERNAL = "external_payment";
-    public static final String QUERY_PAYMENT_LAST4_CC = "last4_cc";
-    public static final String QUERY_PAYMENT_NAME_ON_CC = "name_on_cc";
+    public static final String QUERY_PAYMENT_EXTERNAL = "externalPayment";
+    public static final String QUERY_PAYMENT_LAST4_CC = "last4CC";
+    public static final String QUERY_PAYMENT_NAME_ON_CC = "nameOnCC";
 
-    public static final String QUERY_TAGS = "tag_list";
-    public static final String QUERY_CUSTOM_FIELDS = "custom_field_list";
+    public static final String QUERY_TAGS = "tagList";
+    public static final String QUERY_CUSTOM_FIELDS = "customFieldList";
 
-    public static final String QUERY_PAYMENT_METHOD_PLUGIN_INFO = "plugin_info";
-    public static final String QUERY_PAYMENT_METHOD_IS_DEFAULT = "is_default";
+    public static final String QUERY_PAYMENT_METHOD_PLUGIN_INFO = "withPluginInfo";
+    public static final String QUERY_PAYMENT_METHOD_IS_DEFAULT = "isDefault";
 
 
     public static final String ACCOUNTS = "accounts";