diff --git a/wrappers/java/java_class.mustache b/wrappers/java/java_class.mustache
index 66e337f9e..afe0d173c 100644
--- a/wrappers/java/java_class.mustache
+++ b/wrappers/java/java_class.mustache
@@ -110,7 +110,7 @@ public {{#isLinphoneFactory}}abstract class{{/isLinphoneFactory}}{{#isNotLinphon
       */
     {{/doc}}
     {{#deprecated}}@Deprecated
-    {{/deprecated}}{{#isLinphoneFactory}}abstract {{/isLinphoneFactory}}public {{return}} {{name}}({{params}}){{#exception}} throws CoreException{{/exception}}{{#enumCast}} throws CoreException{{/enumCast}};
+    {{/deprecated}}{{#isLinphoneFactory}}abstract {{/isLinphoneFactory}}public {{return}} {{name}}({{params}});
 
 {{/methods}}
     /**
@@ -132,7 +132,7 @@ public {{#isLinphoneFactory}}abstract class{{/isLinphoneFactory}}{{#isNotLinphon
         {{/lines}}
     */
     {{/doc}}
-    public {{return}} {{name}}({{params}}){{#exception}} throws CoreException{{/exception}}{{#enumCast}} throws CoreException{{/enumCast}};
+    public {{return}} {{name}}({{params}}){{#exception}} throws CoreException{{/exception}};
 
 {{/staticMethods}}
 {{/isNotLinphoneFactory}}
@@ -181,7 +181,7 @@ class {{classImplName}} {{#isLinphoneFactory}}extends{{/isLinphoneFactory}}{{#is
 {{#methods}}
     private native {{return_native}} {{name}}({{native_params}});
     @Override
-    public {{return}} {{name}}({{params}}) {{#exception}}throws CoreException{{/exception}}{{#enumCast}}throws CoreException{{/enumCast}} {
+    public {{return}} {{name}}({{params}}) {{#exception}}throws CoreException{{/exception}} {
         {{#exception}}int exceptionResult = {{/exception}}{{return_keyword}}{{#enumCast}}{{return}}.fromInt({{/enumCast}}{{#classCast}}({{return}}){{/classCast}}{{name}}(nativePtr{{native_params_impl}}){{#enumCast}}){{/enumCast}};{{#exception}}
         if (exceptionResult != 0) throw new CoreException("{{name}} returned value " + exceptionResult);{{/exception}}
     }
diff --git a/wrappers/java/migration.sh b/wrappers/java/migration.sh
index 70b7ae3c0..49febcfa8 100644
--- a/wrappers/java/migration.sh
+++ b/wrappers/java/migration.sh
@@ -8,8 +8,8 @@ eval "$SED_START 's/import org.linphone.tools/import org.linphone.core.tools/g'
 eval "$SED_START 's/import org.linphone.core.OpenH264DownloadHelperListener/import org.linphone.core.tools.OpenH264DownloadHelperListener/g' $SED_END"
 
 # Listeners
-eval "$SED_START 's/LinphoneAccountCreator.AccountCreatorListener/AccountCreatorListener/g' $SED_END"
-eval "$SED_START 's/AccountCreator.AccountCreatorListener/AccountCreatorListener/g' $SED_END"
+eval "$SED_START 's/LinphoneAccountCreator.LinphoneAccountCreatorListener/AccountCreatorListener/g' $SED_END"
+eval "$SED_START 's/AccountCreator.LinphoneAccountCreatorListener/AccountCreatorListener/g' $SED_END"
 eval "$SED_START 's/LinphoneCoreListenerBase/CoreListenerStub/g' $SED_END"
 eval "$SED_START 's/LinphoneCoreListener/CoreListener/g' $SED_END"
 eval "$SED_START 's/LinphoneChatMessage.LinphoneChatMessageListener/ChatMessageListener/g' $SED_END"