diff --git a/generator-spring/lib/assert.openapi.js b/generator-spring/lib/assert.openapi.js
index 347bc49..dca02de 100644
--- a/generator-spring/lib/assert.openapi.js
+++ b/generator-spring/lib/assert.openapi.js
@@ -62,10 +62,10 @@ function AssertOpenApi () {
         'src/main/java/io/swagger/RFC3339DateFormat.java',
         'src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java',
         'src/main/java/io/swagger/configuration/HomeController.java',
-        'src/main/java/io/swagger/api/NotFoundException.java',
-        'src/main/java/io/swagger/api/ApiResponseMessage.java',
-        'src/main/java/io/swagger/api/ApiOriginFilter.java',
-        'src/main/java/io/swagger/api/ApiException.java'
+        'src/main/java/application/NotFoundException.java',
+        'src/main/java/application/ApiResponseMessage.java',
+        'src/main/java/application/ApiOriginFilter.java',
+        'src/main/java/application/ApiException.java'
       ])
     })
     if (examples.includes('example')) {
diff --git a/generator-spring/lib/openapi.js b/generator-spring/lib/openapi.js
index d0e8200..4afb8a0 100644
--- a/generator-spring/lib/openapi.js
+++ b/generator-spring/lib/openapi.js
@@ -53,7 +53,7 @@ const generate = function (docs, parentLogger) {
 }
 
 const generateFromDoc = function (doc) {
-  return performSDKGenerationAsync('testSpringSDK', 'server_java_spring_boot', doc)
+  return performSDKGenerationAsync('testSpringSDK', 'server_java_spring_bindings', doc)
     .then(generatedID => {
       logger.writeToLog('Spring Generator generated code from open api document with id ' + generatedID)
       return getServerSDKAsync('testSpringSDK', generatedID)
@@ -72,7 +72,8 @@ const performSDKGenerationAsync = function (sdkName, sdkType, fileContent) {
   return request.postAsync({
     headers: {
       'Accept': 'application/json',
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
+      'Openapi-Opts': 'apiPackage=application,modelPackage=application.model,apiTemplateFiles=apiBinding.mustache=Binding.java'
     },
     url: startGenURL,
     body: fileContent
@@ -88,8 +89,8 @@ const performSDKGenerationAsync = function (sdkName, sdkType, fileContent) {
     .then(generatedID => checkUntilFinished(generatedID))
 
   function checkUntilFinished (generatedID, count) {
-    count = count || 1
-    logger.writeToLog(`#${count} checking status of SDK generation job with id ${generatedID} (for ${sdkName})`)
+    count = count || 1;
+    logger.writeToLog(`#${count} checking status of SDK generation job with id ${generatedID} (for ${sdkName})`);
     return getStatusAsync(generatedID)
       .then(finished => {
         if (finished) {