diff --git a/ChangeLog.md b/ChangeLog.md
index 1d28d93..c0664c4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,8 @@
+## 3.3.1
+
+* Fix: Replaced Yoast i18n-module with wpbp/i18n-notice to keep support
+* Enhancement: Improvements on Initialize for class detection
+
 ## 3.3.0
 
 * Enhancement: wp-scripts integration
diff --git a/plugin-name/backend/Notices.php b/plugin-name/backend/Notices.php
index 964b0c5..6eed3d0 100644
--- a/plugin-name/backend/Notices.php
+++ b/plugin-name/backend/Notices.php
@@ -61,7 +61,7 @@ public function initialize() {
 		 * Alert after few days to suggest to contribute to the localization if it is incomplete
 		 * on translate.wordpress.org, the filter enables to remove globally.
 		 */
-		// WPBPGen{{#if libraries_yoast__i18n-module}}
+		// WPBPGen{{#if libraries_wpbp__i18n-notice}}
 		if ( \apply_filters( 'plugin_name_alert_localization', true ) ) {
 			new I18n_Notice_WordPressOrg(
 			array(
diff --git a/plugin-name/phpstan.neon b/plugin-name/phpstan.neon
index a74038f..1eca887 100644
--- a/plugin-name/phpstan.neon
+++ b/plugin-name/phpstan.neon
@@ -23,7 +23,7 @@ parameters:
     scanFiles:
         - plugin-name.php
         - uninstall.php
-        # WPBPGen{{#if libraries_yoast__i18n-module}}
+        # WPBPGen{{#if libraries_wpbp__i18n-notice}}
         - vendor/wpbp/i18n-notice/src/i18n-wordpressorg-v3.php
         # {{/if}}
         # WPBPGen{{#if libraries_freemius__wordpress-sdk}}