diff --git a/.generator/src/generator/templates/model_base.j2 b/.generator/src/generator/templates/model_base.j2
index be04deeead38..1cae5526a0b0 100644
--- a/.generator/src/generator/templates/model_base.j2
+++ b/.generator/src/generator/templates/model_base.j2
@@ -219,7 +219,7 @@ module {{ module_name }}::{{ version|upper }}
           return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
         end
       else # model
-        const = DatadogAPIClient::V1.const_get(klass)
+        const = DatadogAPIClient::{{ version|upper }}.const_get(klass)
         if const
           if const.respond_to?(:openapi_one_of) # nested oneOf model
             model = const.build(data)
diff --git a/lib/datadog_api_client/v2/model_base.rb b/lib/datadog_api_client/v2/model_base.rb
index 2a59619798c6..f1afd1ab8b4b 100644
--- a/lib/datadog_api_client/v2/model_base.rb
+++ b/lib/datadog_api_client/v2/model_base.rb
@@ -230,7 +230,7 @@ def find_and_cast_into_type(klass, data)
           return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
         end
       else # model
-        const = DatadogAPIClient::V1.const_get(klass)
+        const = DatadogAPIClient::V2.const_get(klass)
         if const
           if const.respond_to?(:openapi_one_of) # nested oneOf model
             model = const.build(data)