diff --git a/bin/dart-jaguar-petstore.sh b/bin/dart-jaguar-petstore.sh
index 64d2762a6bea..7eafff792f9e 100755
--- a/bin/dart-jaguar-petstore.sh
+++ b/bin/dart-jaguar-petstore.sh
@@ -41,3 +41,9 @@ java $JAVA_OPTS -jar $executable $ags
 
 # The current petstore test will then work for both: the browser library and the vm library.
 
+cd samples/client/petstore/dart-jaguar/openapi
+pub get
+pub run build_runner build --delete-conflicting-outputs
+cd ../flutter_petstore/openapi
+pub get
+pub run build_runner build --delete-conflicting-outputs
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/pubspec.mustache
index fb6dd286ab13..30bdbdc28e55 100644
--- a/modules/openapi-generator/src/main/resources/dart-jaguar/pubspec.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-jaguar/pubspec.mustache
@@ -7,6 +7,6 @@ dependencies:
     jaguar_retrofit: '^2.5.4'
     jaguar_serializer: '^2.2.2'
 dev_dependencies:
-    jaguar_retrofit_gen: '^2.5.1'
+    jaguar_retrofit_gen: '^2.5.2'
     jaguar_serializer_cli: '^2.2.1'
     build_runner: '^0.10.0'
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
index fc203a12f0cc..99f51a0d6a63 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2018-09-10T20:17:32.515369+02:00[Europe/Paris]
+- Build date: 2018-09-11T20:14:36.094083+02:00[Europe/Paris]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
index a911cfdc2c4f..c0108e390f6f 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
@@ -32,14 +32,14 @@ final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKey
 
 class JaguarApiGen {
     List<Interceptor> interceptors;
-    String baseSwaggerPath = "http://petstore.swagger.io/v2";
+    String basePath = "http://petstore.swagger.io/v2";
     Route _baseRoute;
 
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
     JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl}) {
-        _baseRoute = Route(baseUrl ?? baseSwaggerPath).withClient(globalClient ?? IOClient());
+        _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;
         }
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/pubspec.yaml b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/pubspec.yaml
index 532ec86915fc..001a842f966d 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/pubspec.yaml
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/pubspec.yaml
@@ -7,6 +7,6 @@ dependencies:
     jaguar_retrofit: '^2.5.4'
     jaguar_serializer: '^2.2.2'
 dev_dependencies:
-    jaguar_retrofit_gen: '^2.5.1'
+    jaguar_retrofit_gen: '^2.5.2'
     jaguar_serializer_cli: '^2.2.1'
     build_runner: '^0.10.0'
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/openapi/README.md b/samples/client/petstore/dart-jaguar/openapi/README.md
index ef3d79e653f4..04923f119a4f 100644
--- a/samples/client/petstore/dart-jaguar/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/openapi/README.md
@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2018-09-10T20:17:28.677286+02:00[Europe/Paris]
+- Build date: 2018-09-11T20:14:34.644821+02:00[Europe/Paris]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/dart-jaguar/openapi/pubspec.yaml b/samples/client/petstore/dart-jaguar/openapi/pubspec.yaml
index 532ec86915fc..001a842f966d 100644
--- a/samples/client/petstore/dart-jaguar/openapi/pubspec.yaml
+++ b/samples/client/petstore/dart-jaguar/openapi/pubspec.yaml
@@ -7,6 +7,6 @@ dependencies:
     jaguar_retrofit: '^2.5.4'
     jaguar_serializer: '^2.2.2'
 dev_dependencies:
-    jaguar_retrofit_gen: '^2.5.1'
+    jaguar_retrofit_gen: '^2.5.2'
     jaguar_serializer_cli: '^2.2.1'
     build_runner: '^0.10.0'
\ No newline at end of file