diff --git a/CHANGELOG b/CHANGELOG
index c8eb12364..f21294e0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 KeePassDX(2.9.2)
  * Prevent manual creation of existing field name #718
+ * Harmonization of field names #789
  * Fix search in OTP #780
  * Fix empty OTP field after selection #781
  * Fix same save shared info #783
diff --git a/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt b/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt
index 283a65bb6..69c965b2c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt
@@ -107,7 +107,7 @@ class EntryInfo : Parcelable {
     private fun addUniqueField(field: Field, number: Int = 0) {
         var sameName = false
         var sameValue = false
-        val suffix = if (number > 0) number.toString() else ""
+        val suffix = if (number > 0) "_$number" else ""
         customFields.forEach { currentField ->
             // Not write the same data again
             if (currentField.protectedValue.stringValue == field.protectedValue.stringValue) {
@@ -152,7 +152,8 @@ class EntryInfo : Parcelable {
             else if (url != webDomainToStore){
                 // Save web domain in custom field
                 addUniqueField(Field(WEB_DOMAIN_FIELD_NAME,
-                        ProtectedString(false, webDomainToStore))
+                        ProtectedString(false, webDomainToStore)),
+                        1 // Start to one because URL is a standard field name
                 )
             }
         } ?: run {
@@ -169,8 +170,8 @@ class EntryInfo : Parcelable {
 
     companion object {
 
-        const val WEB_DOMAIN_FIELD_NAME = "WebDomain"
-        const val APPLICATION_ID_FIELD_NAME = "ApplicationId"
+        const val WEB_DOMAIN_FIELD_NAME = "URL"
+        const val APPLICATION_ID_FIELD_NAME = "AndroidApp"
 
         @JvmField
         val CREATOR: Parcelable.Creator<EntryInfo> = object : Parcelable.Creator<EntryInfo> {
diff --git a/fastlane/metadata/android/en-US/changelogs/46.txt b/fastlane/metadata/android/en-US/changelogs/46.txt
index 10dc884ed..5143d0a7b 100644
--- a/fastlane/metadata/android/en-US/changelogs/46.txt
+++ b/fastlane/metadata/android/en-US/changelogs/46.txt
@@ -1,4 +1,5 @@
  * Prevent manual creation of existing field name #718
+ * Harmonization of field names #789
  * Fix search in OTP #780
  * Fix empty OTP field after selection #781
  * Fix same save shared info #783
diff --git a/fastlane/metadata/android/fr-FR/changelogs/46.txt b/fastlane/metadata/android/fr-FR/changelogs/46.txt
index 5bc6a91ff..3dfb23acf 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/46.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/46.txt
@@ -1,4 +1,5 @@
  * Préviens la création manuelle d'un nom de champ existant #718
+ * Harmonisation des noms de champ #789
  * Correction de la recherche de l'OTP #780
  * Correction de champ OTP vide après sélection #781
  * Correction de la sauvegarde d'une même info partagée #783