diff --git a/wrappers/java/genwrapper.py b/wrappers/java/genwrapper.py
index de3366c07..b9de6e321 100644
--- a/wrappers/java/genwrapper.py
+++ b/wrappers/java/genwrapper.py
@@ -61,8 +61,8 @@ ENUMS_LIST = {
     'SubscribePolicy': 'Friend',
     'TransportType': 'Address',
     'TunnelMode': 'Tunnel',
-    'XmlRpcArgType': 'XmlRpcRequest',
-    'XmlRpcStatus': 'XmlRpcRequest',
+    'XmlRpcRequestArgType': 'XmlRpcRequest',
+    'XmlRpcRequestStatus': 'XmlRpcRequest',
 }
 
 ##########################################################################
@@ -572,11 +572,19 @@ class JavaEnum(object):
         self._class = translator.translate_enum(_enum)
         self.packageName = package
         self.className = _enum.name.to_camel_case()
+        if self.className == 'XmlRpcArgType':
+            self.className = 'XmlRpcRequestArgType'
+        elif self.className == 'XmlRpcStatus':
+            self.className = 'XmlRpcRequestStatus'
         self.cPrefix = 'linphone_' + _enum.name.to_snake_case()
         self.filename = self.className + ".java"
         self.values = self._class['values']
         self.doc = self._class['doc']
         self.jniName = translator.translate_java_jni_enum_name(_enum)
+        if self.className == 'XmlRpcRequestArgType':
+            self.jniName = 'XmlRpcRequest$ArgType'
+        elif self.className == 'XmlRpcRequestStatus':
+            self.jniName = 'XmlRpcRequest$Status'
 
 class JniInterface(object):
     def __init__(self, javaClass, apiClass):
diff --git a/wrappers/java/migration.sh b/wrappers/java/migration.sh
index 2c74ed8d6..8ebac2c72 100644
--- a/wrappers/java/migration.sh
+++ b/wrappers/java/migration.sh
@@ -38,6 +38,7 @@ eval "$SED_START 's/LogCollectionUploadState.LogCollectionUploadStateDelivered/L
 eval "$SED_START 's/LogCollectionUploadState.LogCollectionUploadStateNotDelivered/LogCollectionUploadState.NotDelivered/g' $SED_END"
 
 eval "$SED_START 's/AccountCreator.RequestStatus/AccountCreator.Status/g' $SED_END"
+eval "$SED_START 's/RequestStatus/Status/g' $SED_END"
 eval "$SED_START 's/AccountCreator.Status.Ok/AccountCreator.Status.RequestOk/g' $SED_END"
 eval "$SED_START 's/AccountCreator.PasswordCheck/AccountCreator.PasswordStatus/g' $SED_END"
 eval "$SED_START 's/AccountCreator.PhoneNumberCheck/AccountCreator.PhoneNumberStatus/g' $SED_END"
@@ -45,6 +46,7 @@ eval "$SED_START 's/AccountCreator.EmailCheck/AccountCreator.EmailStatus/g' $SED
 eval "$SED_START 's/AccountCreator.UsernameCheck/AccountCreator.UsernameStatus/g' $SED_END"
 eval "$SED_START 's/AccountCreator.Status.Failed/AccountCreator.Status.RequestFailed/g' $SED_END"
 eval "$SED_START 's/AccountCreator.Status.ErrorServer/AccountCreator.Status.ServerError/g' $SED_END"
+eval "$SED_START 's/PhoneNumberStatus.CountryCodeInvalid/PhoneNumberStatus.InvalidCountryCode/g' $SED_END"
 
 eval "$SED_START 's/Reason.Media/Reason.NotAcceptable/g' $SED_END"
 eval "$SED_START 's/Reason.BadCredentials/Reason.Forbidden/g' $SED_END"
@@ -175,7 +177,8 @@ eval "$SED_START 's/VideoDefinition().toDisplayableString()/VideoDefinition().ge
 eval "$SED_START 's/isAccountUsed/isAccountExist()/g' $SED_END"
 eval "$SED_START 's/loadXmlFile(/loadFromXmlFile(/g' $SED_END"
 eval "$SED_START 's/activatePhoneNumberLink()/activateAlias()/g' $SED_END"
-eval "$SED_START 's//g' $SED_END"
+eval "$SED_START 's/isPhoneNumberUsed()/isAliasUsed()/g' $SED_END"
+eval "$SED_START 's/recoverPhoneAccount()/recoverAccount()/g' $SED_END"
 
 # Removed methods
 eval "$SED_START 's/.isRegistered()/.getState() == RegistrationState.Ok/g' $SED_END"