diff --git a/README.md b/README.md
index b479739b90..c5559d6b2b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 Swagger core Version      | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------------- | ------------ | -------------------------- | ----- | ----
-1.5.14 (**current stable**)| 2017-03-17  | 2.0           | [tag v1.5.14](https://github.com/swagger-api/swagger-core/tree/v1.5.14) | Supported
+1.5.15-SNAPSHOT (**current stable**)| 2017-03-17  | 2.0           | [tag v1.5.15-SNAPSHOT](https://github.com/swagger-api/swagger-core/tree/v1.5.15-SNAPSHOT) | Supported
 1.3.12                    | 2014-12-23   | 1.2           | [tag v1.3.12](https://github.com/swagger-api/swagger-core/tree/v1.3.12) | Supported
 1.2.4                     | 2013-06-19   | 1.1           | [tag swagger-project_2.10.0-1.2.4](https://github.com/swagger-api/swagger-core/tree/swagger-project_2.10.0-1.2.4) | Deprecated
 1.0.0                     | 2011-10-16   | 1.0           | [tag v1.0](https://github.com/swagger-api/swagger-core/tree/v1.0) | Deprecated
@@ -53,7 +53,7 @@ You need the following installed and available in your $PATH:
 * Apache maven 3.0.4 or greater (http://maven.apache.org/)
 
 
-### To build from source (currently 1.5.14)
+### To build from source (currently 1.5.15-SNAPSHOT)
 ```
 # first time building locally
 mvn -N
diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml
index 608c8c12ba..90470ee56b 100644
--- a/modules/swagger-annotations/pom.xml
+++ b/modules/swagger-annotations/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-annotations</artifactId>
-    <version>1.5.14</version>
+    <version>1.5.15-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>swagger-annotations</name>
     <build>
diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
index 5870e63bb8..c12f66cd2c 100644
--- a/modules/swagger-core/pom.xml
+++ b/modules/swagger-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-hibernate-validations/pom.xml b/modules/swagger-hibernate-validations/pom.xml
index 2e136dfcd5..eb77670c15 100644
--- a/modules/swagger-hibernate-validations/pom.xml
+++ b/modules/swagger-hibernate-validations/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-hibernate-validations</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.14</version>
+    <version>1.5.15-SNAPSHOT</version>
     <name>swagger-hibernate-validations</name>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/modules/swagger-jaxrs/pom.xml b/modules/swagger-jaxrs/pom.xml
index be300fc664..b069cbe862 100644
--- a/modules/swagger-jaxrs/pom.xml
+++ b/modules/swagger-jaxrs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-jersey-jaxrs/pom.xml b/modules/swagger-jersey-jaxrs/pom.xml
index 5d91f8993c..2f28ecac3b 100644
--- a/modules/swagger-jersey-jaxrs/pom.xml
+++ b/modules/swagger-jersey-jaxrs/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-jersey-jaxrs</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.14</version>
+    <version>1.5.15-SNAPSHOT</version>
     <name>swagger-jersey-jaxrs</name>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/modules/swagger-jersey2-jaxrs/pom.xml b/modules/swagger-jersey2-jaxrs/pom.xml
index bcce394949..f1760c95d2 100644
--- a/modules/swagger-jersey2-jaxrs/pom.xml
+++ b/modules/swagger-jersey2-jaxrs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
index d78a2f374a..8b43d98abd 100644
--- a/modules/swagger-models/pom.xml
+++ b/modules/swagger-models/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-models/src/main/java/io/swagger/models/refs/GenericRef.java b/modules/swagger-models/src/main/java/io/swagger/models/refs/GenericRef.java
index 8607687898..333cb54456 100644
--- a/modules/swagger-models/src/main/java/io/swagger/models/refs/GenericRef.java
+++ b/modules/swagger-models/src/main/java/io/swagger/models/refs/GenericRef.java
@@ -83,7 +83,7 @@ private static String computeSimpleRef(String ref, RefFormat format, RefType typ
         //simple refs really only apply to internal refs
         if (format == RefFormat.INTERNAL) {
             String prefix = type.getInternalPrefix();
-            result = ref.substring(prefix.length());
+            result = ref.substring(ref.lastIndexOf("/") + 1);
         }
 
         return result;
diff --git a/modules/swagger-mule/pom.xml b/modules/swagger-mule/pom.xml
index 9c5daedb73..aa232624a2 100644
--- a/modules/swagger-mule/pom.xml
+++ b/modules/swagger-mule/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-servlet/pom.xml b/modules/swagger-servlet/pom.xml
index dcf16fa39c..72cb47fd53 100644
--- a/modules/swagger-servlet/pom.xml
+++ b/modules/swagger-servlet/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>1.5.14</version>
+        <version>1.5.15-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 8398a87909..07c7621ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>swagger-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-project</name>
-    <version>1.5.14</version>
+    <version>1.5.15-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-core</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-core.git</connection>