diff --git a/modules/openapi-generator/src/main/resources/dart/class.mustache b/modules/openapi-generator/src/main/resources/dart/class.mustache
index 4cd00eeb792..5090bc210d1 100644
--- a/modules/openapi-generator/src/main/resources/dart/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/class.mustache
@@ -17,30 +17,35 @@ class {{classname}} {
     if (json == null) return;
   {{#vars}}
   {{#isDateTime}}
-    {{name}} = json['{{name}}'] == null ? null : DateTime.parse(json['{{name}}']);
+    {{name}} = json['{{baseName}}'] == null ? null : DateTime.parse(json['{{baseName}}']);
   {{/isDateTime}}
+  {{#isDate}}
+    {{name}} = json['{{baseName}}'] == null ? null : DateTime.parse(json['{{baseName}}']);
+  {{/isDate}}
   {{^isDateTime}}
+  {{^isDate}}
     {{#complexType}}
       {{#isListContainer}}
-    {{name}} = {{complexType}}.listFromJson(json['{{name}}']);
+    {{name}} = {{complexType}}.listFromJson(json['{{baseName}}']);
       {{/isListContainer}}
       {{^isListContainer}}
       {{#isMapContainer}}
-    {{name}} = {{complexType}}.mapFromJson(json['{{name}}']);
+    {{name}} = {{complexType}}.mapFromJson(json['{{baseName}}']);
       {{/isMapContainer}}
       {{^isMapContainer}}
-    {{name}} = new {{complexType}}.fromJson(json['{{name}}']);
+    {{name}} = new {{complexType}}.fromJson(json['{{baseName}}']);
       {{/isMapContainer}}
       {{/isListContainer}}
     {{/complexType}}
     {{^complexType}}
       {{#isListContainer}}
-    {{name}} = (json['{{name}}'] as List).map((item) => item as {{items.datatype}}).toList();
+    {{name}} = (json['{{baseName}}'] as List).map((item) => item as {{items.datatype}}).toList();
       {{/isListContainer}}
       {{^isListContainer}}
-    {{name}} = json['{{name}}'];
+    {{name}} = json['{{baseName}}'];
       {{/isListContainer}}
     {{/complexType}}
+  {{/isDate}}
   {{/isDateTime}}
   {{/vars}}
   }
@@ -49,10 +54,15 @@ class {{classname}} {
     return {
     {{#vars}}
       {{#isDateTime}}
-      '{{name}}': {{name}} == null ? '' : {{name}}.toUtc().toIso8601String(){{^-last}},{{/-last}}
+      '{{baseName}}': {{name}} == null ? '' : {{name}}.toUtc().toIso8601String(){{^-last}},{{/-last}}
       {{/isDateTime}}
+      {{#isDate}}
+      '{{baseName}}': {{name}} == null ? '' : {{name}}.toUtc().toIso8601String(){{^-last}},{{/-last}}
+      {{/isDate}}
       {{^isDateTime}}
-      '{{name}}': {{name}}{{^-last}},{{/-last}}
+      {{^isDate}}
+      '{{baseName}}': {{name}}{{^-last}},{{/-last}}
+      {{/isDate}}
       {{/isDateTime}}
     {{/vars}}
     };