diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy
index 65e96b8d8c..990eada6f8 100755
--- a/accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy
@@ -67,7 +67,7 @@ class TestGenerator {
 				def className = afterLast(includedDirectoryRelativePath, File.separator) + configProperties.targetFramework.classNameSuffix
 				def packageName = buildPackage(basePackageNameForClass, includedDirectoryRelativePath)
 				def classBytes = generator.buildClass(filesToClass, className, packageName).getBytes(StandardCharsets.UTF_8)
-				saver.saveClassFile(className, basePackageNameForClass, includedDirectoryRelativePath, classBytes)
+				saver.saveClassFile(className, basePackageNameForClass, convertIllegalPackageChars(includedDirectoryRelativePath), classBytes)
 				counter.incrementAndGet()
 			}
 		}
@@ -75,7 +75,7 @@ class TestGenerator {
 
 	private static String buildPackage(final String packageNameForClass, final String includedDirectoryRelativePath) {
 		String directory = beforeLast(includedDirectoryRelativePath, File.separator)
-		return !directory.empty ? "$packageNameForClass.${directoryToPackage(directory)}" : packageNameForClass
+		return !directory.empty ? "$packageNameForClass.${directoryToPackage(convertIllegalPackageChars(directory))}" : packageNameForClass
 	}
 
 	private static String normalizePath(String path) {
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy
index 1986d45a9a..8e4d9037ee 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy
@@ -51,6 +51,10 @@ class NamesUtil {
 	}
 
 	static String directoryToPackage(String directory) {
-		return directory.replace(File.separator, '.').replace('-', '_')
+		return directory.replace(File.separator, '.')
+	}
+
+	static String convertIllegalPackageChars(String packageName) {
+		return packageName.replace('-', '_')
 	}
 }
diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
index 2c1a485f31..7457760cf9 100755
--- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
+++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
@@ -7,10 +7,10 @@ import spock.lang.Stepwise
 @Stepwise
 class BasicFunctionalSpec extends IntegrationSpec {
 
-	private static final String GENERATED_TEST = "build//generated-sources//accurest//accurest//PairIdSpec.groovy"
-	private static final String GENERATED_CLIENT_JSON_STUB = "build//production//bootSimple-stubs//repository//mappings//pairId//collerate_PlacesFrom_Tweet.json"
+	private static final String GENERATED_TEST = "build//generated-sources//accurest//accurest//twitter_places_analyzer//PairIdSpec.groovy"
+	private static final String GENERATED_CLIENT_JSON_STUB = "build//production//bootSimple-stubs//repository//mappings//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.json"
 	private static final String GROOVY_DSL_CONTRACT = "repository//mappings//com//ofg//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.groovy"
-	private static final String TEST_EXECUTION_XML_REPORT = "build/test-results/TEST-accurest.PairIdSpec.xml"
+	private static final String TEST_EXECUTION_XML_REPORT = "build/test-results/TEST-accurest.twitter_places_analyzer.PairIdSpec.xml"
 
 	void setup() {
 		copyResources("functionalTest/bootSimple", "")
diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
index e7565e3efe..c6c08c4b0b 100644
--- a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
+++ b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'groovy'
 apply plugin: 'accurest'
 
 ext {
-	contractsDir = file("${project.rootDir}/repository/mappings/com/ofg/twitter-places-analyzer")
+	contractsDir = file("${project.rootDir}/repository/mappings/com/ofg")
 	wireMockStubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/")
 	wireMockStubsOutputDir = new File(wireMockStubsOutputDirRoot, 'repository/mappings/')
 }