diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index da4645811..4fabcb598 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -120,7 +120,15 @@ public interface Database {
   /**
    * Return AutoTune which is used to control the AutoTune service at runtime.
    */
-  AutoTune getAutoTune();
+  AutoTune autoTune();
+
+  /**
+   * Deprecated migrate to autoTune().
+   */
+  @Deprecated
+  default AutoTune getAutoTune() {
+    return autoTune();
+  }
 
   /**
    * Return the associated DataSource for this Database instance.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index c30134f31..0f1302f92 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -350,7 +350,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public AutoTune getAutoTune() {
+  public AutoTune autoTune() {
     return autoTuneService;
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index a4ec77ffd..2067b4ebb 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -333,7 +333,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public AutoTune getAutoTune() {
+  public AutoTune autoTune() {
     return null;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java
index a81bf1596..60952e34e 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java
@@ -32,8 +32,8 @@ public class TestBatchLazy extends BaseTestCase {
       }
     }
 
-    Ebean.getDefaultServer().getAutoTune().collectProfiling();
-    Ebean.getDefaultServer().getAutoTune().reportProfiling();
+    Ebean.getDefaultServer().autoTune().collectProfiling();
+    Ebean.getDefaultServer().autoTune().reportProfiling();
 
   }
 
diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java
index 8d368a9c8..0c21fb250 100644
--- a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java
+++ b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java
@@ -68,7 +68,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase {
 
   private static void collectUsage() {
 
-    Ebean.getDefaultServer().getAutoTune().collectProfiling();
+    Ebean.getDefaultServer().autoTune().collectProfiling();
   }
 
 }
diff --git a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
index 65ccbc893..33804cfb3 100644
--- a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
+++ b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java
@@ -117,7 +117,7 @@ public class TestAutoTuneProfiling extends BaseTestCase {
 
   private static void collectUsage() {
 
-    DB.getDefault().getAutoTune().collectProfiling();
+    DB.getDefault().autoTune().collectProfiling();
   }
 
 }