diff --git a/src/main/java/io/ebean/text/csv/CsvCallback.java b/src/main/java/io/ebean/text/csv/CsvCallback.java
index 749ae51d9..a3a501268 100644
--- a/src/main/java/io/ebean/text/csv/CsvCallback.java
+++ b/src/main/java/io/ebean/text/csv/CsvCallback.java
@@ -1,6 +1,6 @@
 package io.ebean.text.csv;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 
 /**
  * Provides callback methods for customisation of CSV processing.
@@ -8,9 +8,6 @@ import io.ebean.EbeanServer;
  * You can provide your own CsvCallback implementation to customise the CSV
  * processing. It is expected that the DefaultCsvCallback provides a good base
  * class that you can extend.
- * </p>
- *
- * @param <T>
  */
 public interface CsvCallback<T> {
 
@@ -21,7 +18,7 @@ public interface CsvCallback<T> {
    * size etc.
    * </p>
    */
-  void begin(EbeanServer server);
+  void begin(Database database);
 
   /**
    * Read the header row.
@@ -73,8 +70,8 @@ public interface CsvCallback<T> {
    * was created.
    * </p>
    *
-   * @param row the row that the error has occured on
-   * @param e   the error that occured
+   * @param row the row that the error has occurred on
+   * @param e   the error that occurred
    */
   void endWithError(int row, Exception e);
 
diff --git a/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
index 18b4dd282..4bb2ae5cd 100644
--- a/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
+++ b/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
@@ -1,6 +1,6 @@
 package io.ebean.text.csv;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   /**
    * The EbeanServer used to save the beans.
    */
-  protected EbeanServer server;
+  protected Database server;
 
   /**
    * Used to log a message to indicate progress through large files.
@@ -69,7 +69,6 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
    * Construct with explicit batch size and logging info frequency.
    */
   public DefaultCsvCallback(int persistBatchSize, int logInfoFrequency) {
-
     this.persistBatchSize = persistBatchSize;
     this.logInfoFrequency = logInfoFrequency;
   }
@@ -78,10 +77,9 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
    * Create a transaction if required.
    */
   @Override
-  public void begin(EbeanServer server) {
+  public void begin(Database server) {
     this.server = server;
     this.startTime = System.currentTimeMillis();
-
     initTransactionIfRequired();
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
index 01a3b6065..2f3c0716b 100644
--- a/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.text.csv;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.ExpressionPath;
 import io.ebean.text.StringParser;
@@ -31,7 +31,7 @@ public class TCsvReader<T> implements CsvReader<T> {
 
   private static final TimeStringParser TIME_PARSER = new TimeStringParser();
 
-  private final EbeanServer server;
+  private final Database server;
 
   private final BeanDescriptor<T> descriptor;
 
@@ -55,7 +55,7 @@ public class TCsvReader<T> implements CsvReader<T> {
 
   private boolean addPropertiesFromHeader;
 
-  public TCsvReader(EbeanServer server, BeanDescriptor<T> descriptor) {
+  public TCsvReader(Database server, BeanDescriptor<T> descriptor) {
     this.server = server;
     this.descriptor = descriptor;
   }
@@ -349,7 +349,6 @@ public class TCsvReader<T> implements CsvReader<T> {
       try {
         Date dt = dateFormat.parse(value);
         return path.parseDateTime(dt.getTime());
-
       } catch (ParseException e) {
         throw new TextException("Error parsing [{}] using format[" + format + "]", value, e);
       }