diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/Oracle9Platform.java b/src/main/java/com/avaje/ebean/config/dbplatform/Oracle9Platform.java
deleted file mode 100644
index 8e484860d..000000000
--- a/src/main/java/com/avaje/ebean/config/dbplatform/Oracle9Platform.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-/**
- * Since Ebean v2.2.0 Oracle9 is no different from Oracle10.
- * <p>
- * This will be removed in the future.
- * </p>
- */
-public class Oracle9Platform extends Oracle10Platform {
-
-  public Oracle9Platform() {
-    super();
-  }
-
-}
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/Oracle10DbEncrypt.java b/src/main/java/com/avaje/ebean/config/dbplatform/OracleDbEncrypt.java
similarity index 95%
rename from src/main/java/com/avaje/ebean/config/dbplatform/Oracle10DbEncrypt.java
rename to src/main/java/com/avaje/ebean/config/dbplatform/OracleDbEncrypt.java
index aa0a36500..90ab9eab2 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/Oracle10DbEncrypt.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/OracleDbEncrypt.java
@@ -43,12 +43,12 @@ package com.avaje.ebean.config.dbplatform;
  * 
  * @author rbygrave
  */
-public class Oracle10DbEncrypt extends AbstractDbEncrypt {
+public class OracleDbEncrypt extends AbstractDbEncrypt {
 
   /**
    * Constructs the Oracle10DbEncrypt with default encrypt and decrypt stored procedures.
    */
-  public Oracle10DbEncrypt() {
+  public OracleDbEncrypt() {
     this("eb_encrypt", "eb_decrypt");
   }
 
@@ -58,7 +58,7 @@ public class Oracle10DbEncrypt extends AbstractDbEncrypt {
    * @param encryptFunction the encrypt stored procedure
    * @param decryptFunction the decrypt stored procedure
    */
-  public Oracle10DbEncrypt(String encryptFunction, String decryptFunction) {
+  public OracleDbEncrypt(String encryptFunction, String decryptFunction) {
 
     this.varcharEncryptFunction = new OraVarcharFunction(encryptFunction, decryptFunction);
     this.dateEncryptFunction = new OraDateFunction(encryptFunction, decryptFunction);
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/Oracle10Platform.java b/src/main/java/com/avaje/ebean/config/dbplatform/OraclePlatform.java
similarity index 94%
rename from src/main/java/com/avaje/ebean/config/dbplatform/Oracle10Platform.java
rename to src/main/java/com/avaje/ebean/config/dbplatform/OraclePlatform.java
index 43a2c6c1a..592c0a462 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/Oracle10Platform.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/OraclePlatform.java
@@ -9,16 +9,16 @@ import java.sql.Types;
 /**
  * Oracle10 and greater specific platform.
  */
-public class Oracle10Platform extends DatabasePlatform {
+public class OraclePlatform extends DatabasePlatform {
 
-  public Oracle10Platform() {
+  public OraclePlatform() {
     super();
     this.name = "oracle";
     this.maxTableNameLength = 30;
     this.maxConstraintNameLength = 30;
     // OnQueryOnly.CLOSE as a performance optimisation on Oracle
     this.onQueryOnly = OnQueryOnly.CLOSE;
-    this.dbEncrypt = new Oracle10DbEncrypt();
+    this.dbEncrypt = new OracleDbEncrypt();
     this.sqlLimiter = new RownumSqlLimiter();
     this.platformDdl = new Oracle10Ddl(this.dbTypeMap, this.dbIdentity);
     this.historySupport = new OracleDbHistorySupport();
diff --git a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java b/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java
index 5ee238209..33b918f80 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java
@@ -11,7 +11,7 @@ import com.avaje.ebean.config.dbplatform.DbPlatformName;
 import com.avaje.ebean.config.dbplatform.H2Platform;
 import com.avaje.ebean.config.dbplatform.MsSqlServer2005Platform;
 import com.avaje.ebean.config.dbplatform.MySqlPlatform;
-import com.avaje.ebean.config.dbplatform.Oracle10Platform;
+import com.avaje.ebean.config.dbplatform.OraclePlatform;
 import com.avaje.ebean.config.dbplatform.PostgresPlatform;
 import com.avaje.ebean.config.dbplatform.SQLitePlatform;
 import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite;
@@ -250,7 +250,7 @@ public class DbMigration {
       case MYSQL:
         return new MySqlPlatform();
       case ORACLE:
-        return new Oracle10Platform();
+        return new OraclePlatform();
       case SQLSERVER:
         return new MsSqlServer2005Platform();
       case DB2:
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java
index b22c155fb..49c5cac20 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -72,11 +72,8 @@ public class DatabasePlatformFactory {
     if (dbName.equals("postgres8") || dbName.equals("postgres83")) {
       return new Postgres8Platform();
     }
-    if (dbName.equals("oracle9")) {
-      return new Oracle9Platform();
-    }
-    if (dbName.equals("oracle") || dbName.equals("oracle10")) {
-      return new Oracle10Platform();
+    if (dbName.equals("oracle") || dbName.equals("oracle10") || dbName.equals("oracle9")) {
+      return new OraclePlatform();
     }
     if (dbName.equals("sqlserver")) {
       return new MsSqlServer2005Platform();
@@ -137,11 +134,7 @@ public class DatabasePlatformFactory {
     int majorVersion = metaData.getDatabaseMajorVersion();
 
     if (dbProductName.contains("oracle")) {
-      if (majorVersion > 9) {
-        return new Oracle10Platform();
-      } else {
-        return new Oracle9Platform();
-      }
+      return new OraclePlatform();
     }
     else if (dbProductName.contains("microsoft")) {
       if (majorVersion > 8) {
diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java
index 876ad54db..cc7a4d2b3 100644
--- a/src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java
+++ b/src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java
@@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class OraclePlatformTest {
 
-  Oracle10Platform platform = new Oracle10Platform();
+  OraclePlatform platform = new OraclePlatform();
 
   @Test
   public void testTypeConversion() {
diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index ac2711e0a..a10d16a0f 100644
--- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -3,7 +3,7 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform;
 import com.avaje.ebean.config.dbplatform.H2Platform;
 import com.avaje.ebean.config.dbplatform.MsSqlServer2005Platform;
 import com.avaje.ebean.config.dbplatform.MySqlPlatform;
-import com.avaje.ebean.config.dbplatform.Oracle10Platform;
+import com.avaje.ebean.config.dbplatform.OraclePlatform;
 import com.avaje.ebean.config.dbplatform.PostgresPlatform;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import org.junit.Test;
@@ -16,7 +16,7 @@ public class PlatformDdl_AlterColumnTest {
   PlatformDdl h2Ddl = new H2Platform().getPlatformDdl();
   PlatformDdl pgDdl = new PostgresPlatform().getPlatformDdl();
   PlatformDdl mysqlDdl = new MySqlPlatform().getPlatformDdl();
-  PlatformDdl oraDdl = new Oracle10Platform().getPlatformDdl();
+  PlatformDdl oraDdl = new OraclePlatform().getPlatformDdl();
   PlatformDdl sqlServerDdl = new MsSqlServer2005Platform().getPlatformDdl();
 
   AlterColumn alterNotNull() {
diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
index df2f5ccf8..9db08611a 100644
--- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
+++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
@@ -3,7 +3,7 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform;
 import com.avaje.ebean.config.dbplatform.H2Platform;
 import com.avaje.ebean.config.dbplatform.MsSqlServer2005Platform;
 import com.avaje.ebean.config.dbplatform.MySqlPlatform;
-import com.avaje.ebean.config.dbplatform.Oracle10Platform;
+import com.avaje.ebean.config.dbplatform.OraclePlatform;
 import com.avaje.ebean.config.dbplatform.PostgresPlatform;
 import org.junit.Test;
 
@@ -15,7 +15,7 @@ public class PlatformDdl_dropUniqueConstraintTest {
   PlatformDdl h2Ddl = new H2Platform().getPlatformDdl();
   PlatformDdl pgDdl = new PostgresPlatform().getPlatformDdl();
   PlatformDdl mysqlDdl = new MySqlPlatform().getPlatformDdl();
-  PlatformDdl oraDdl = new Oracle10Platform().getPlatformDdl();
+  PlatformDdl oraDdl = new OraclePlatform().getPlatformDdl();
   PlatformDdl sqlServerDdl = new MsSqlServer2005Platform().getPlatformDdl();
 
   @Test