diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
index 105d102446..8cfd7a7ac4 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
@@ -26,14 +26,14 @@ class TestGenerator {
 
 	TestGenerator(AccurestConfigProperties configProperties, SingleTestGenerator generator, FileSaver saver) {
 		this.configProperties = configProperties
-		if (configProperties.stubsBaseDirectory == null) {
-			throw new AccurestException("Stubs directory not found under " + configProperties.stubsBaseDirectory)
+		if (configProperties.contractsDslDir == null) {
+			throw new AccurestException("Stubs directory not found under " + configProperties.contractsDslDir)
 		}
 		this.generator = generator
 		this.saver = saver
 		this.directoryScanner = new DirectoryScanner()
 		directoryScanner.setExcludes(configProperties.getIgnoredFiles() as String[])
-		directoryScanner.setBasedir(configProperties.stubsBaseDirectory)
+		directoryScanner.setBasedir(configProperties.contractsDslDir)
 	}
 
 	int generate() {
@@ -59,7 +59,7 @@ class TestGenerator {
 						return includedFile.matches(includedDirectoryRelativePath + File.separator + "[A-Za-z0-9]*\\.groovy")
 					}
 			.collect {
-				return new File(configProperties.stubsBaseDirectory, it)
+				return new File(configProperties.contractsDslDir, it)
 			}
 			if (filesToClass.size()) {
 				def className = afterLast(includedDirectoryRelativePath, File.separator)
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
index 3f6e50c889..ea16a0a361 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
@@ -6,14 +6,13 @@ package io.coderate.accurest.config
 class AccurestConfigProperties {
 	TestFramework targetFramework = TestFramework.SPOCK
 	TestMode testMode = TestMode.MOCKMVC
-	File stubsBaseDirectory
 	String basePackageForTests
 	String baseClassForTests
 	String ruleClassForTests
 	List<String> ignoredFiles = []
-	File generatedTestSourcesDir
 	String[] imports = []
 	String[] staticImports = []
-	File groovyDslDir
-	File generatedWiremockClientStubsDir
+	File contractsDslDir
+	File generatedTestSourcesDir
+	File stubsOutputDir
 }
diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy
index 27b9ec796d..4f16ddde86 100644
--- a/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy
+++ b/accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy
@@ -8,7 +8,7 @@ import io.coderate.accurest.config.TestMode
 class MainTest {
 	public static void main(String[] args) {
 		AccurestConfigProperties properties = new AccurestConfigProperties(
-				stubsBaseDirectory: new File('/home/devel/projects/codearte/accurest/accurest-core/src/test/resources/dsl'),
+				contractsDslDir: new File('/home/devel/projects/codearte/accurest/accurest-core/src/test/resources/dsl'),
 				generatedTestSourcesDir: new File('/tmp/accurest'),
 				targetFramework: TestFramework.SPOCK, testMode: TestMode.MOCKMVC, basePackageForTests: 'io.test',
 				staticImports: ['com.pupablada.Test.*'], imports: ['org.innapypa.Test'], ignoredFiles: ["**/other"])
diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/TestGeneratorSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/TestGeneratorSpec.groovy
index 0fcb65fe50..f9f0233cbe 100644
--- a/accurest-core/src/test/groovy/io/codearte/accurest/TestGeneratorSpec.groovy
+++ b/accurest-core/src/test/groovy/io/codearte/accurest/TestGeneratorSpec.groovy
@@ -4,7 +4,6 @@ import io.coderate.accurest.FileSaver
 import io.coderate.accurest.SingleTestGenerator
 import io.coderate.accurest.TestGenerator
 import io.coderate.accurest.config.AccurestConfigProperties
-import spock.lang.Ignore
 import spock.lang.Specification
 
 class TestGeneratorSpec extends Specification {
@@ -15,7 +14,7 @@ class TestGeneratorSpec extends Specification {
 		given:
 			File resource = new File(this.getClass().getResource("/directory/with/stubs/stubsRepositoryIndicator").toURI())
 			AccurestConfigProperties properties = new AccurestConfigProperties()
-			properties.stubsBaseDirectory = resource.parentFile
+			properties.contractsDslDir = resource.parentFile
 			TestGenerator testGenerator = new TestGenerator(properties, classGenerator, Stub(FileSaver))
 		when:
 			testGenerator.generateTestClasses("com.ofg")
@@ -28,7 +27,7 @@ class TestGeneratorSpec extends Specification {
 			File resource = new File(this.getClass().getResource("/directory/with/stubs/stubsRepositoryIndicator").toURI())
 			AccurestConfigProperties properties = new AccurestConfigProperties()
 			properties.ignoredFiles << "**/other/**"
-			properties.stubsBaseDirectory = resource.parentFile
+			properties.contractsDslDir = resource.parentFile
 			TestGenerator testGenerator = new TestGenerator(properties, classGenerator, Stub(FileSaver))
 		when:
 			testGenerator.generateTestClasses("com.ofg")
@@ -41,7 +40,7 @@ class TestGeneratorSpec extends Specification {
 			File resource = new File(this.getClass().getResource("/directory/with/stubs/stubsRepositoryIndicator").toURI())
 			AccurestConfigProperties properties = new AccurestConfigProperties()
 			properties.ignoredFiles << "**/other.groovy"
-			properties.stubsBaseDirectory = resource.parentFile
+			properties.contractsDslDir = resource.parentFile
 			TestGenerator testGenerator = new TestGenerator(properties, classGenerator, Stub(FileSaver))
 			classGenerator.buildClass(_, _, _) >> "sample"
 		when:
diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
index 11c9d75ba8..6f94c402ed 100644
--- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
+++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
@@ -43,7 +43,7 @@ class AccurestGradlePlugin implements Plugin<Project> {
 	void setConfigurationDefaults(AccurestConfigProperties extension) {
 		extension.with {
 			generatedTestSourcesDir = project.file("${project.buildDir}/generated-sources/accurest")
-			stubsBaseDirectory = project.file("${project.rootDir}/src/test/resources/stubs") //TODO: Use sourceset
+			contractsDslDir = project.file("${project.rootDir}/src/test/resources/stubs") //TODO: Use sourceset
 			basePackageForTests = 'io.codearte.accurest.tests'
 		}
 	}
@@ -61,8 +61,8 @@ class AccurestGradlePlugin implements Plugin<Project> {
 		Task task = project.tasks.create(DSL_TO_WIREMOCK_CLIENT_TASK_NAME, GenerateWiremockClientStubsFromDslTask)
 		task.description = "Generate Wiremock client stubs from GroovyDSL"
 		task.conventionMapping.with {
-			groovyDslDir = { extension.groovyDslDir }
-			generatedWiremockClientStubsDir = { extension.generatedWiremockClientStubsDir }
+			groovyDslDir = { extension.contractsDslDir }
+			generatedWiremockClientStubsDir = { extension.stubsOutputDir }
 		}
 	}
 }