diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java
index 619e87b3c..971ae5854 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java
@@ -197,7 +197,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   /**
    * Read the value from JsonParser.
    */
-  T jsonRead(JsonParser ctx, JsonToken event) throws IOException;
+  T jsonRead(JsonParser parser, JsonToken event) throws IOException;
 
   /**
    * Write the value to the JsonGenerator.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java
index 051520772..6090d566d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -69,11 +69,11 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public T jsonRead(JsonParser parser, JsonToken event) throws IOException {
     if (JsonToken.VALUE_NUMBER_INT == event) {
-      return convertFromMillis(ctx.getLongValue());
+      return convertFromMillis(parser.getLongValue());
     } else {
-      return convertFromDate(Date.valueOf(ctx.getText()));
+      return convertFromDate(Date.valueOf(parser.getText()));
     }
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index e5568eb43..b1f586cad 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -84,19 +84,19 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public T jsonRead(JsonParser parser, JsonToken event) throws IOException {
 
     switch (event) {
       case VALUE_NUMBER_INT: {
-        return convertFromMillis(ctx.getLongValue());
+        return convertFromMillis(parser.getLongValue());
       }
       case VALUE_NUMBER_FLOAT: {
-        BigDecimal value = ctx.getDecimalValue();
+        BigDecimal value = parser.getDecimalValue();
         Timestamp timestamp = DecimalUtils.toTimestamp(value);
         return convertFromTimestamp(timestamp);
       }
       default: {
-        String jsonDateTime = ctx.getText();
+        String jsonDateTime = parser.getText();
         return convertFromTimestamp(dateTimeParser.parse(jsonDateTime));
       }
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
index db5a4b9dd..3e83137b3 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
@@ -123,8 +123,8 @@ public abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return parse(ctx.getValueAsString());
+  public T jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parse(parser.getValueAsString());
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 757fc5f3e..2016aac00 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -1,5 +1,9 @@
 package com.avaje.ebeaninternal.server.type;
 
+import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -7,11 +11,6 @@ import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-
 /**
  * ScalarType for BigDecimal.
  */
@@ -78,8 +77,8 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
   }
 
   @Override
-  public BigDecimal jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getDecimalValue();
+  public BigDecimal jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getDecimalValue();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java
index 05cd4ebf1..71f8a7d23 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -280,7 +280,7 @@ public class ScalarTypeBoolean {
     }
 
     @Override
-    public Boolean jsonRead(JsonParser ctx, JsonToken event) {
+    public Boolean jsonRead(JsonParser parser, JsonToken event) {
       return JsonToken.VALUE_TRUE == event ? Boolean.TRUE : Boolean.FALSE;
     }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java
index a5b3e8cb8..96146175f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java
@@ -47,7 +47,7 @@ public class ScalarTypeByte extends ScalarTypeBase<Byte> {
   }
 
   @Override
-  public Byte jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public Byte jsonRead(JsonParser parser, JsonToken event) throws IOException {
     throw new IOException("Not supported");
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java
index 42f6bd1ff..87d30b801 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java
@@ -46,9 +46,9 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase<byte[]> {
   }
 
   @Override
-  public byte[] jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public byte[] jsonRead(JsonParser parser, JsonToken event) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream(500);
-    ctx.readBinaryValue(out);
+    parser.readBinaryValue(out);
     return out.toByteArray();
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index 09a83db3a..8ffc8ad2b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -69,9 +69,9 @@ public class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
   }
 
   @Override
-  public byte[] jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public byte[] jsonRead(JsonParser parser, JsonToken event) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream(500);
-    ctx.readBinaryValue(out);
+    parser.readBinaryValue(out);
     return out.toByteArray();
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java
index 1394e5d86..7a924c931 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -64,8 +64,8 @@ public class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
   }
 
   @Override
-  public char[] jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getValueAsString().toCharArray();
+  public char[] jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getValueAsString().toCharArray();
   }
 
   public void jsonWrite(JsonGenerator ctx, String name, char[] value) throws IOException {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java
index ee9161f17..7b4e869f5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -85,8 +85,8 @@ public class ScalarTypeDouble extends ScalarTypeBase<Double> {
   }
 
   @Override
-  public Double jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getDoubleValue();
+  public Double jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getDoubleValue();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java
index 475096cd5..13331e5b9 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -102,8 +102,8 @@ public class ScalarTypeDuration extends ScalarTypeBase<Duration> {
   }
 
   @Override
-  public Duration jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return Duration.parse(ctx.getValueAsString());
+  public Duration jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return Duration.parse(parser.getValueAsString());
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index 40f49baf1..e96490a5b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -133,8 +133,8 @@ public class ScalarTypeEncryptedWrapper<T> implements ScalarType<T> {
   }
 
   @Override
-  public T jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return wrapped.jsonRead(ctx, event);
+  public T jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return wrapped.jsonRead(parser, event);
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index d34f114a1..b23068c1e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -232,8 +232,8 @@ public class ScalarTypeEnumStandard {
     }
 
     @Override
-    public Object jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-      return parse(ctx.getValueAsString());
+    public Object jsonRead(JsonParser parser, JsonToken event) throws IOException {
+      return parse(parser.getValueAsString());
     }
 
     @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java
index bd0db71b2..83e8946ca 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java
@@ -109,10 +109,10 @@ public class ScalarTypeFile extends ScalarTypeBase<File> {
   }
 
   @Override
-  public File jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public File jsonRead(JsonParser parser, JsonToken event) throws IOException {
     File tempFile = File.createTempFile(prefix, suffix, directory);
     OutputStream os = getOutputStream(tempFile);
-    ctx.readBinaryValue(os);
+    parser.readBinaryValue(os);
     os.flush();
     os.close();
     return tempFile;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java
index 1095ac35e..b4986a965 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -1,16 +1,15 @@
 package com.avaje.ebeaninternal.server.type;
 
+import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import com.avaje.ebeaninternal.server.core.BasicTypeConverter;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-
 /**
  * ScalarType for Float and float.
  */
@@ -85,8 +84,8 @@ public class ScalarTypeFloat extends ScalarTypeBase<Float> {
   }
 
   @Override
-  public Float jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getFloatValue();
+  public Float jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getFloatValue();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java
index 4f31b1cd9..49bb2bc55 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -85,8 +85,8 @@ public class ScalarTypeInteger extends ScalarTypeBase<Integer> {
   }
 
   @Override
-  public Integer jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getIntValue();
+  public Integer jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getIntValue();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index a7be53060..0ccd33c93 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -77,12 +77,12 @@ public class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
   }
 
   @Override
-  public LocalTime jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public LocalTime jsonRead(JsonParser parser, JsonToken event) throws IOException {
     if (JsonToken.VALUE_NUMBER_INT == event) {
-      long millis = ctx.getLongValue();
+      long millis = parser.getLongValue();
       return convertFromMillis(millis);
     } else {
-      String string = ctx.getValueAsString();
+      String string = parser.getValueAsString();
       throw new RuntimeException("convert " + string);
     }
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java
index 581d9ffb6..9c6fa750a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -206,11 +206,11 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public Map jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public Map jsonRead(JsonParser parser, JsonToken event) throws IOException {
     // at this point the BeanProperty has read the START_OBJECT token
     // to check for a null value. Pass the START_OBJECT token through to
     // the EJson parsing so that it knows the first token has been read
-    return EJson.parseObject(ctx, event);
+    return EJson.parseObject(parser, event);
   }
 
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java
index be6df4b96..bb3959550 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -218,10 +218,10 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   }
 
   @Override
-  public JsonNode jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public JsonNode jsonRead(JsonParser parser, JsonToken event) throws IOException {
     // at this point the BeanProperty has read the START_OBJECT token
     // to check for a null value.
-    return objectMapper.readValue(ctx, JsonNode.class);
+    return objectMapper.readValue(parser, JsonNode.class);
   }
 
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java
index 3bd46b121..ec72838e8 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -94,8 +94,8 @@ public class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
   }
 
   @Override
-  public LocalTime jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return LocalTime.parse(ctx.getValueAsString());
+  public LocalTime jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return LocalTime.parse(parser.getValueAsString());
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java
index 660622648..b1e67df47 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java
@@ -85,8 +85,8 @@ public class ScalarTypeLong extends ScalarTypeBase<Long> {
   }
 
   @Override
-  public Long jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getLongValue();
+  public Long jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getLongValue();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index 05f62ab57..71f3ec2f3 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -92,8 +92,8 @@ public class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
   }
 
   @Override
-  public BigInteger jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getDecimalValue().toBigInteger();
+  public BigInteger jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getDecimalValue().toBigInteger();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java
index e948352ca..f4230a181 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -119,8 +119,8 @@ public class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
   }
 
   @Override
-  public MonthDay jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return parse(ctx.getValueAsString());
+  public MonthDay jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parse(parser.getValueAsString());
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 8723dce8f..428e09b33 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -123,11 +123,11 @@ public class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public Map jsonRead(JsonParser ctx, JsonToken event) throws IOException {
+  public Map jsonRead(JsonParser parser, JsonToken event) throws IOException {
     // at this point the BeanProperty has read the START_OBJECT token
     // to check for a null value. Pass the START_OBJECT token through to
     // the EJson parsing so that it knows the first token has been read
-    return EJson.parseObject(ctx, event);
+    return EJson.parseObject(parser, event);
   }
 
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java
index f5034b89e..9a9bde0ba 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java
@@ -86,8 +86,8 @@ public class ScalarTypeShort extends ScalarTypeBase<Short> {
   }
 
   @Override
-  public Short jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getShortValue();
+  public Short jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getShortValue();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java
index 437992657..964498a86 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java
@@ -85,8 +85,8 @@ public class ScalarTypeString extends ScalarTypeBase<String> {
   }
 
   @Override
-  public String jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return ctx.getValueAsString();
+  public String jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parser.getValueAsString();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java
index 737c4393a..99ecd8f6b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java
@@ -87,8 +87,8 @@ public class ScalarTypeTime extends ScalarTypeBase<Time> {
   }
 
   @Override
-  public Time jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return parse(ctx.getValueAsString());
+  public Time jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return parse(parser.getValueAsString());
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index cb1d83c76..f340bef68 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -144,8 +144,8 @@ public class ScalarTypeUUIDBinary extends ScalarTypeBase<UUID> {
   }
 
   @Override
-  public UUID jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return UUID.fromString(ctx.getValueAsString());
+  public UUID jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return UUID.fromString(parser.getValueAsString());
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java
index 6d7b84c14..ed84a98ad 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -182,8 +182,8 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
   }
 
   @Override
-  public B jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    S object = scalarType.jsonRead(ctx, event);
+  public B jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    S object = scalarType.jsonRead(parser, event);
     return converter.wrapValue(object);
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java
index bb3c7e4c5..5d4b49478 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java
@@ -89,8 +89,8 @@ public class ScalarTypeYear extends ScalarTypeBase<Year> {
   }
 
   @Override
-  public Year jsonRead(JsonParser ctx, JsonToken event) throws IOException {
-    return Year.of(ctx.getIntValue());
+  public Year jsonRead(JsonParser parser, JsonToken event) throws IOException {
+    return Year.of(parser.getIntValue());
   }
 
   @Override