diff --git a/.generator/src/generator/templates/example.j2 b/.generator/src/generator/templates/example.j2
index ebb5f71f92f..60d4e9aa825 100644
--- a/.generator/src/generator/templates/example.j2
+++ b/.generator/src/generator/templates/example.j2
@@ -1,4 +1,4 @@
-// {{ scenario.name|wordwrap(width=120)}}
+// {{ scenario.name|wordwrap(width=120, wrapstring='\n// ')}}
 
 {%- set required_parameters, optional_parameters, parameters_models = format_parameters(context.api_request.kwargs, spec=operation_spec, replace_values=context._replace_values, has_body=context.body) %}
 {%- if context.body %}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3150b56fb1..f79c1443c9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.47.2/2025-12-11
+
+### Fixed
+* Fix Java example template to properly wrap long scenario names in comments [#3305](https://github.com/DataDog/datadog-api-client-java/pull/3305)
+
 ## 2.47.1/2025-12-09
 
 ### Fixed
diff --git a/pom.xml b/pom.xml
index cde756378be..9ca88b4636c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>datadog-api-client</artifactId>
     <packaging>jar</packaging>
     <name>datadog-api-client</name>
-    <version>2.47.1</version>
+    <version>2.47.2</version>
     <url>https://github.com/DataDog/datadog-api-client-java</url>
     <description>Java client library for Datadog API</description>
     <scm>