diff --git a/.generator/conftest.py b/.generator/conftest.py
index e0814829c0..b188e684d0 100644
--- a/.generator/conftest.py
+++ b/.generator/conftest.py
@@ -294,9 +294,9 @@ def operation_specs(specs):
 @given(parsers.parse('an instance of "{name}" API'))
 def api(context, api_version, specs, name):
     """Return an API instance."""
-    assert name in {tag["name"].replace(" ", "") for tag in specs[api_version]["tags"]}
+    raw_tag = next(t["name"] for t in specs[api_version]["tags"] if t["name"].replace(" ", "") == name)
     name = name.replace("-", "")
-    context["api_instance"] = {"name": name}
+    context["api_instance"] = {"name": name, "raw_tag": raw_tag}
 
 
 @given(parsers.parse('operation "{name}" enabled'))
diff --git a/.generator/src/generator/templates/example.j2 b/.generator/src/generator/templates/example.j2
index 4e88ebc737..35d240ccee 100644
--- a/.generator/src/generator/templates/example.j2
+++ b/.generator/src/generator/templates/example.j2
@@ -1,12 +1,12 @@
 // {{ scenario.name|wordwrap(width=120, wrapstring="\n// ")}}
 
 {%- set variables = given_variables(context) %}
-{%- set parameters, imports = format_parameters(context.api_request.kwargs, spec=operation_spec, replace_values=context._replace_values, has_body=context.body, variables=variables, version=version|upper, api=context["api_instance"]["name"] | snake_case) %}
+{%- set parameters, imports = format_parameters(context.api_request.kwargs, spec=operation_spec, replace_values=context._replace_values, has_body=context.body, variables=variables, version=version|upper, api=context["api_instance"]["raw_tag"] | snake_case) %}
 {%- if context.body %}
 {%- set body, imports = format_data_with_schema(context.body.value, context.api_request.schema.spec, replace_values=context._replace_values, required=True, variables=variables, version=version|upper, imports=imports)%}
 {%- endif %}
 use datadog_api_client::datadog;
-use datadog_api_client::datadog{{ version|upper }}::api_{{context["api_instance"]["name"] | snake_case}}::{{context["api_instance"]["name"]}}API;
+use datadog_api_client::datadog{{ version|upper }}::api_{{context["api_instance"]["raw_tag"] | snake_case}}::{{context["api_instance"]["name"]}}API;
 {%- for name in imports %}
 use {{name}};
 {%- endfor %}