diff --git a/.generator/src/generator/templates/inflector.j2 b/.generator/src/generator/templates/inflector.j2
index 7e36e33feff0..6693e2048190 100644
--- a/.generator/src/generator/templates/inflector.j2
+++ b/.generator/src/generator/templates/inflector.j2
@@ -3,7 +3,7 @@ require 'zeitwerk'
 module {{ module_name }}
   class {{ module_name }}Inflector < Zeitwerk::Inflector
     def camelize(basename, abspath)
-      model_name = "#{abspath.scan(/v[0-9]/).last}.#{basename}"
+      model_name = "#{abspath.match(/datadog_api_client\/(v[0-9])\//)&.captures&.first}.#{basename}"
       overrides[model_name] || basename.split('_').each(&:capitalize!).join
     end
 
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index 7ac059281061..c09207ca3b6f 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -3,7 +3,7 @@
 module DatadogAPIClient
   class DatadogAPIClientInflector < Zeitwerk::Inflector
     def camelize(basename, abspath)
-      model_name = "#{abspath.scan(/v[0-9]/).last}.#{basename}"
+      model_name = "#{abspath.match(/datadog_api_client\/(v[0-9])\//)&.captures&.first}.#{basename}"
       overrides[model_name] || basename.split('_').each(&:capitalize!).join
     end
 
diff --git a/spec/zeitwerk_spec.rb b/spec/zeitwerk_spec.rb
new file mode 100644
index 000000000000..0e717d9dacff
--- /dev/null
+++ b/spec/zeitwerk_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'zeitwerk loader' do
+    it "should load all files" do
+        expect { Zeitwerk::Loader.eager_load_all }.not_to raise_error
+    end
+end