diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy
index dbf23ce4b8..3d08a99885 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy
@@ -1,10 +1,12 @@
 package org.springframework.cloud.contract.verifier.util
 
 import spock.lang.Specification
+
 /**
  * @author Marcin Grzejszczak
  */
 class NamesUtilSpec extends Specification {
+
 	def "should return the whole string before the last one"() {
 		given:
 			String string = "a.b.c.d.e"
@@ -91,9 +93,8 @@ class NamesUtilSpec extends Specification {
 
 	def "should convert all illegal package chars to legal ones"() {
 		given:
-			String string = "a-b c"
+			String string = "a-b c.1.0.x"
 		expect:
-			"a_b_c" == NamesUtil.convertIllegalPackageChars(string)
+			"a_b_c_1_0_x" == NamesUtil.convertIllegalPackageChars(string)
 	}
-
 }
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilTestSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilTestSpec.groovy
deleted file mode 100644
index 8455fdf0c1..0000000000
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilTestSpec.groovy
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.springframework.cloud.contract.verifier.util
-
-import spock.lang.Specification
-
-/**
- * @author Marcin Grzejszczak
- */
-class NamesUtilTestSpec extends Specification {
-
-	def "should return the whole string before the last one"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			"a.b.c.d" == NamesUtil.beforeLast(string, ".")
-	}
-
-	def "should return empty string when no token was found for before last"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			"" == NamesUtil.beforeLast(string, "/")
-	}
-
-	def "should return first token after the last one"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			"e" == NamesUtil.afterLast(string, ".")
-	}
-
-	def "should return the input string when no token was found for after last"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			string == NamesUtil.afterLast(string, "/")
-	}
-
-	def "should return first token after the last dot"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			"e" == NamesUtil.afterLastDot(string)
-	}
-
-	def "should return the input string when no token was found for after last dot"() {
-		given:
-			String string = "abcde"
-		expect:
-			string == NamesUtil.afterLastDot(string)
-	}
-
-	def "should return camel case version of a string"() {
-		given:
-			String string = "BlaBlaBla"
-		expect:
-			"blaBlaBla" == NamesUtil.camelCase(string)
-	}
-
-	def "should return capitalized version of a string"() {
-		given:
-			String string = "blaBlaBla"
-		expect:
-			"BlaBlaBla" == NamesUtil.capitalize(string)
-	}
-
-	def "should return all text to last dot"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			"a.b.c.d" == NamesUtil.toLastDot(string)
-	}
-
-	def "should return the input string when no token was found for to last dot"() {
-		given:
-			String string = "abcde"
-		expect:
-			string == NamesUtil.toLastDot(string)
-	}
-
-	def "should convert a package notation to directory"() {
-		given:
-			String string = "a.b.c.d.e"
-		expect:
-			"a/b/c/d/e".replace("/", File.separator) == NamesUtil.packageToDirectory(string)
-	}
-
-	def "should convert a directory notation to package"() {
-		given:
-			String string = "a/b/c/d/e".replace("/", File.separator)
-		expect:
-			"a.b.c.d.e" == NamesUtil.directoryToPackage(string)
-	}
-
-	def "should convert all illegal package chars to legal ones"() {
-		given:
-			String string = "a-b c.1.0.x"
-		expect:
-			"a_b_c_1_0_x" == NamesUtil.convertIllegalPackageChars(string)
-	}
-}