diff --git a/app/src/main/java/org/linphone/LinphoneContext.java b/app/src/main/java/org/linphone/LinphoneContext.java
index dab63c79b..970da17ac 100644
--- a/app/src/main/java/org/linphone/LinphoneContext.java
+++ b/app/src/main/java/org/linphone/LinphoneContext.java
@@ -255,10 +255,10 @@ public class LinphoneContext {
 
     private void dumpLinphoneInformation() {
         Log.i("==== Linphone information dump ====");
-        Log.i("VERSION NAME=" + BuildConfig.VERSION_NAME);
-        Log.i("VERSION CODE=" + BuildConfig.VERSION_CODE);
-        Log.i("PACKAGE=" + BuildConfig.APPLICATION_ID);
-        Log.i("BUILD TYPE=" + BuildConfig.BUILD_TYPE);
+        Log.i("VERSION NAME=" + org.linphone.BuildConfig.VERSION_NAME);
+        Log.i("VERSION CODE=" + org.linphone.BuildConfig.VERSION_CODE);
+        Log.i("PACKAGE=" + org.linphone.BuildConfig.APPLICATION_ID);
+        Log.i("BUILD TYPE=" + org.linphone.BuildConfig.BUILD_TYPE);
         Log.i("SDK VERSION=" + mContext.getString(R.string.linphone_sdk_version));
         Log.i("SDK BRANCH=" + mContext.getString(R.string.linphone_sdk_branch));
     }
diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index 59fea40df..c4e745507 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -49,7 +49,6 @@ import org.linphone.call.CallManager;
 import org.linphone.contacts.ContactsManager;
 import org.linphone.core.AccountCreator;
 import org.linphone.core.AccountCreatorListenerStub;
-import org.linphone.core.BuildConfig;
 import org.linphone.core.Call;
 import org.linphone.core.Call.State;
 import org.linphone.core.ConfiguringState;
@@ -485,7 +484,7 @@ public class LinphoneManager implements SensorEventListener {
 
         String deviceName = mPrefs.getDeviceName(mContext);
         String appName = mContext.getResources().getString(R.string.user_agent);
-        String androidVersion = BuildConfig.VERSION_NAME;
+        String androidVersion = org.linphone.BuildConfig.VERSION_NAME;
         String userAgent = appName + "/" + androidVersion + " (" + deviceName + ") LinphoneSDK";
 
         mCore.setUserAgent(
diff --git a/app/src/main/java/org/linphone/activities/AboutActivity.java b/app/src/main/java/org/linphone/activities/AboutActivity.java
index 9ae899013..5082705e7 100644
--- a/app/src/main/java/org/linphone/activities/AboutActivity.java
+++ b/app/src/main/java/org/linphone/activities/AboutActivity.java
@@ -33,7 +33,6 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.content.ContextCompat;
-import org.linphone.BuildConfig;
 import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.core.Core;
@@ -77,7 +76,10 @@ public class AboutActivity extends MainActivity {
         aboutVersion.setText(
                 String.format(
                         getString(R.string.about_version),
-                        BuildConfig.VERSION_NAME + " (" + BuildConfig.BUILD_TYPE + ")"));
+                        org.linphone.BuildConfig.VERSION_NAME
+                                + " ("
+                                + org.linphone.BuildConfig.BUILD_TYPE
+                                + ")"));
 
         TextView privacyPolicy = findViewById(R.id.privacy_policy_link);
         privacyPolicy.setOnClickListener(