diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 24b53f4e7..38501baa5 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -45,9 +45,9 @@ import io.ebeaninternal.server.changelog.DefaultChangeLogPrepare;
 import io.ebeaninternal.server.changelog.DefaultChangeLogRegister;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
-import io.ebeaninternal.server.core.timezone.CloneDataTimeZone;
+import io.ebeaninternal.server.core.timezone.OracleDataTimeZone;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.core.timezone.LocalDataTimeZone;
+import io.ebeaninternal.server.core.timezone.MySqlDataTimeZone;
 import io.ebeaninternal.server.core.timezone.NoDataTimeZone;
 import io.ebeaninternal.server.core.timezone.SimpleDataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
@@ -529,12 +529,12 @@ public class InternalConfiguration {
     String tz = serverConfig.getDataTimeZone();
     if (tz == null) {
       if (isMySql(getPlatform())) {
-        return new LocalDataTimeZone();
+        return new MySqlDataTimeZone();
       }
       return new NoDataTimeZone();
     }
     if (getPlatform().base() == Platform.ORACLE) {
-      return new CloneDataTimeZone(tz);
+      return new OracleDataTimeZone(tz);
     } else {
       return new SimpleDataTimeZone(tz);
     }
diff --git a/src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java
similarity index 60%
rename from src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java
rename to src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java
index f128240ce..85ceab500 100644
--- a/src/main/java/io/ebeaninternal/server/core/timezone/LocalDataTimeZone.java
+++ b/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java
@@ -5,11 +5,11 @@ import java.util.Calendar;
 /**
  * Implementation of DataTimeZone when single Calendar instance is used with local timezone.
  */
-public class LocalDataTimeZone implements DataTimeZone {
+public class MySqlDataTimeZone implements DataTimeZone {
 
   protected final Calendar zone;
 
-  public LocalDataTimeZone() {
+  public MySqlDataTimeZone() {
     this.zone = Calendar.getInstance();
   }
 
@@ -19,7 +19,7 @@ public class LocalDataTimeZone implements DataTimeZone {
   }
 
   @Override
-    public Calendar getDateTimeZone() {
-      return zone; // workaround for MySQL. TODO: rename class to MySqlDataTimeZone!?
-    }
+  public Calendar getDateTimeZone() {
+    return zone;
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/core/timezone/CloneDataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/OracleDataTimeZone.java
similarity index 79%
rename from src/main/java/io/ebeaninternal/server/core/timezone/CloneDataTimeZone.java
rename to src/main/java/io/ebeaninternal/server/core/timezone/OracleDataTimeZone.java
index 7dd18da11..ef93349ea 100644
--- a/src/main/java/io/ebeaninternal/server/core/timezone/CloneDataTimeZone.java
+++ b/src/main/java/io/ebeaninternal/server/core/timezone/OracleDataTimeZone.java
@@ -8,9 +8,9 @@ import java.util.Calendar;
  * Used with Oracle JDBC driver as that wants to mutate the Calender.
  * </p>
  */
-public class CloneDataTimeZone extends SimpleDataTimeZone {
+public class OracleDataTimeZone extends SimpleDataTimeZone {
 
-  public CloneDataTimeZone(String zoneId) {
+  public OracleDataTimeZone(String zoneId) {
     super(zoneId);
   }