diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dbf839f28..5225920e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,7 +70,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ui.voip.VoipActivity"
+            android:name=".ui.call.CallActivity"
             android:launchMode="singleTask"
             android:turnScreenOn="true"
             android:showWhenLocked="true"
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 779694aff..8abcf073b 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -37,7 +37,7 @@ import org.linphone.contacts.ContactsManager
 import org.linphone.core.tools.Log
 import org.linphone.notifications.NotificationsManager
 import org.linphone.telecom.TelecomManager
-import org.linphone.ui.voip.VoipActivity
+import org.linphone.ui.call.CallActivity
 import org.linphone.utils.ActivityMonitor
 import org.linphone.utils.LinphoneUtils
 
@@ -331,8 +331,8 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
 
     @UiThread
     fun showCallActivity() {
-        Log.i("$TAG Starting VoIP activity")
-        val intent = Intent(context, VoipActivity::class.java)
+        Log.i("$TAG Starting Call activity")
+        val intent = Intent(context, CallActivity::class.java)
         // This flag is required to start an Activity from a Service context
         intent.addFlags(
             Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 16cd178b4..cc0234aae 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -58,7 +58,7 @@ import org.linphone.core.CoreForegroundService
 import org.linphone.core.CoreListenerStub
 import org.linphone.core.Friend
 import org.linphone.core.tools.Log
-import org.linphone.ui.voip.VoipActivity
+import org.linphone.ui.call.CallActivity
 import org.linphone.utils.AppUtils
 import org.linphone.utils.ImageUtils
 import org.linphone.utils.LinphoneUtils
@@ -324,7 +324,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
     private fun showCallNotification(call: Call, isIncoming: Boolean) {
         val notifiable = getNotifiableForCall(call)
 
-        val callNotificationIntent = Intent(context, VoipActivity::class.java)
+        val callNotificationIntent = Intent(context, CallActivity::class.java)
         callNotificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         val pendingIntent = PendingIntent.getActivity(
             context,
diff --git a/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
similarity index 90%
rename from app/src/main/java/org/linphone/ui/voip/VoipActivity.kt
rename to app/src/main/java/org/linphone/ui/call/CallActivity.kt
index 228282670..182b77c9a 100644
--- a/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt
+++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip
+package org.linphone.ui.call
 
 import android.app.PictureInPictureParams
 import android.content.pm.PackageManager
@@ -41,26 +41,26 @@ import kotlinx.coroutines.launch
 import org.linphone.LinphoneApplication
 import org.linphone.R
 import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipActivityBinding
-import org.linphone.ui.voip.fragment.ActiveCallFragmentDirections
-import org.linphone.ui.voip.fragment.AudioDevicesMenuDialogFragment
-import org.linphone.ui.voip.fragment.IncomingCallFragmentDirections
-import org.linphone.ui.voip.fragment.OutgoingCallFragmentDirections
-import org.linphone.ui.voip.model.AudioDeviceModel
-import org.linphone.ui.voip.viewmodel.CallsViewModel
-import org.linphone.ui.voip.viewmodel.CurrentCallViewModel
-import org.linphone.ui.voip.viewmodel.SharedCallViewModel
+import org.linphone.databinding.CallActivityBinding
+import org.linphone.ui.call.fragment.ActiveCallFragmentDirections
+import org.linphone.ui.call.fragment.AudioDevicesMenuDialogFragment
+import org.linphone.ui.call.fragment.IncomingCallFragmentDirections
+import org.linphone.ui.call.fragment.OutgoingCallFragmentDirections
+import org.linphone.ui.call.model.AudioDeviceModel
+import org.linphone.ui.call.viewmodel.CallsViewModel
+import org.linphone.ui.call.viewmodel.CurrentCallViewModel
+import org.linphone.ui.call.viewmodel.SharedCallViewModel
 import org.linphone.utils.AppUtils
 import org.linphone.utils.slideInToastFromTop
 import org.linphone.utils.slideInToastFromTopForDuration
 
 @UiThread
-class VoipActivity : AppCompatActivity() {
+class CallActivity : AppCompatActivity() {
     companion object {
-        private const val TAG = "[VoIP Activity]"
+        private const val TAG = "[Call Activity]"
     }
 
-    private lateinit var binding: VoipActivityBinding
+    private lateinit var binding: CallActivityBinding
 
     private lateinit var sharedViewModel: SharedCallViewModel
     private lateinit var callsViewModel: CallsViewModel
@@ -74,13 +74,13 @@ class VoipActivity : AppCompatActivity() {
             Thread.sleep(20)
         }
 
-        binding = DataBindingUtil.setContentView(this, R.layout.voip_activity)
+        binding = DataBindingUtil.setContentView(this, R.layout.call_activity)
         binding.lifecycleOwner = this
 
         lifecycleScope.launch(Dispatchers.Main) {
             WindowInfoTracker
-                .getOrCreate(this@VoipActivity)
-                .windowLayoutInfo(this@VoipActivity)
+                .getOrCreate(this@CallActivity)
+                .windowLayoutInfo(this@CallActivity)
                 .collect { newLayoutInfo ->
                     updateCurrentLayout(newLayoutInfo)
                 }
@@ -108,20 +108,20 @@ class VoipActivity : AppCompatActivity() {
         callsViewModel.showIncomingCallEvent.observe(this) {
             it.consume {
                 val action = IncomingCallFragmentDirections.actionGlobalIncomingCallFragment()
-                findNavController(R.id.voip_nav_container).navigate(action)
+                findNavController(R.id.call_nav_container).navigate(action)
             }
         }
 
         callsViewModel.showOutgoingCallEvent.observe(this) {
             it.consume {
                 val action = OutgoingCallFragmentDirections.actionGlobalOutgoingCallFragment()
-                findNavController(R.id.voip_nav_container).navigate(action)
+                findNavController(R.id.call_nav_container).navigate(action)
             }
         }
 
         callsViewModel.goToActiveCallEvent.observe(this) {
             it.consume {
-                val navController = findNavController(R.id.voip_nav_container)
+                val navController = findNavController(R.id.call_nav_container)
                 val action = when (navController.currentDestination?.id) {
                     R.id.outgoingCallFragment -> {
                         OutgoingCallFragmentDirections.actionOutgoingCallFragmentToActiveCallFragment()
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
similarity index 94%
rename from app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
index ddd21718b..0726d1aac 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -37,11 +37,11 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipActiveCallFragmentBinding
-import org.linphone.ui.voip.VoipActivity
-import org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel
-import org.linphone.ui.voip.viewmodel.CurrentCallViewModel
-import org.linphone.ui.voip.viewmodel.SharedCallViewModel
+import org.linphone.databinding.CallActiveFragmentBinding
+import org.linphone.ui.call.CallActivity
+import org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel
+import org.linphone.ui.call.viewmodel.CurrentCallViewModel
+import org.linphone.ui.call.viewmodel.SharedCallViewModel
 import org.linphone.utils.AppUtils
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
@@ -52,7 +52,7 @@ class ActiveCallFragment : GenericCallFragment() {
         private const val TAG = "[Active Call Fragment]"
     }
 
-    private lateinit var binding: VoipActiveCallFragmentBinding
+    private lateinit var binding: CallActiveFragmentBinding
 
     private lateinit var callViewModel: CurrentCallViewModel
 
@@ -96,7 +96,7 @@ class ActiveCallFragment : GenericCallFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = VoipActiveCallFragmentBinding.inflate(layoutInflater)
+        binding = CallActiveFragmentBinding.inflate(layoutInflater)
         return binding.root
     }
 
@@ -138,7 +138,7 @@ class ActiveCallFragment : GenericCallFragment() {
 
         callViewModel.isRemoteDeviceTrusted.observe(viewLifecycleOwner) { trusted ->
             if (trusted) {
-                (requireActivity() as VoipActivity).showBlueToast(
+                (requireActivity() as CallActivity).showBlueToast(
                     getString(R.string.toast_call_can_be_trusted),
                     R.drawable.trusted
                 )
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/AudioDevicesMenuDialogFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/AudioDevicesMenuDialogFragment.kt
similarity index 89%
rename from app/src/main/java/org/linphone/ui/voip/fragment/AudioDevicesMenuDialogFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/AudioDevicesMenuDialogFragment.kt
index 203b3a4f4..b537a8502 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/AudioDevicesMenuDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/AudioDevicesMenuDialogFragment.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -26,8 +26,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.UiThread
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import org.linphone.databinding.VoipAudioDevicesMenuBinding
-import org.linphone.ui.voip.model.AudioDeviceModel
+import org.linphone.databinding.CallAudioDevicesMenuBinding
+import org.linphone.ui.call.model.AudioDeviceModel
 
 @UiThread
 class AudioDevicesMenuDialogFragment(
@@ -53,7 +53,7 @@ class AudioDevicesMenuDialogFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val view = VoipAudioDevicesMenuBinding.inflate(layoutInflater)
+        val view = CallAudioDevicesMenuBinding.inflate(layoutInflater)
 
         for (device in devicesList) {
             device.dismissDialog = {
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/CallsListFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
similarity index 84%
rename from app/src/main/java/org/linphone/ui/voip/fragment/CallsListFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
index 68065bb50..cfeb4839c 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/CallsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -26,18 +26,18 @@ import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.navGraphViewModels
 import org.linphone.R
-import org.linphone.databinding.VoipCallsListFragmentBinding
-import org.linphone.ui.voip.viewmodel.CallsViewModel
+import org.linphone.databinding.CallsListFragmentBinding
+import org.linphone.ui.call.viewmodel.CallsViewModel
 
 class CallsListFragment : GenericCallFragment() {
     companion object {
         private const val TAG = "[Calls List Fragment]"
     }
 
-    private lateinit var binding: VoipCallsListFragmentBinding
+    private lateinit var binding: CallsListFragmentBinding
 
     private val viewModel: CallsViewModel by navGraphViewModels(
-        R.id.voip_nav_graph
+        R.id.call_nav_graph
     )
 
     override fun onCreateView(
@@ -45,7 +45,7 @@ class CallsListFragment : GenericCallFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = VoipCallsListFragmentBinding.inflate(layoutInflater)
+        binding = CallsListFragmentBinding.inflate(layoutInflater)
         return binding.root
     }
 
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/GenericCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/GenericCallFragment.kt
similarity index 93%
rename from app/src/main/java/org/linphone/ui/voip/fragment/GenericCallFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/GenericCallFragment.kt
index 0dbd3f058..2472d2aa7 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/GenericCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/GenericCallFragment.kt
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.UiThread
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import org.linphone.ui.voip.viewmodel.SharedCallViewModel
+import org.linphone.ui.call.viewmodel.SharedCallViewModel
 
 @UiThread
 abstract class GenericCallFragment : Fragment() {
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/IncomingCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
similarity index 86%
rename from app/src/main/java/org/linphone/ui/voip/fragment/IncomingCallFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
index 4e5841ec5..75e7d48ed 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/IncomingCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.os.Bundle
 import android.os.SystemClock
@@ -26,12 +26,12 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.UiThread
 import androidx.lifecycle.ViewModelProvider
-import org.linphone.databinding.VoipIncomingCallFragmentBinding
-import org.linphone.ui.voip.viewmodel.CurrentCallViewModel
+import org.linphone.databinding.CallIncomingFragmentBinding
+import org.linphone.ui.call.viewmodel.CurrentCallViewModel
 
 @UiThread
 class IncomingCallFragment : GenericCallFragment() {
-    private lateinit var binding: VoipIncomingCallFragmentBinding
+    private lateinit var binding: CallIncomingFragmentBinding
 
     private lateinit var callViewModel: CurrentCallViewModel
 
@@ -40,7 +40,7 @@ class IncomingCallFragment : GenericCallFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = VoipIncomingCallFragmentBinding.inflate(layoutInflater)
+        binding = CallIncomingFragmentBinding.inflate(layoutInflater)
         return binding.root
     }
 
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/NewCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/NewCallFragment.kt
similarity index 99%
rename from app/src/main/java/org/linphone/ui/voip/fragment/NewCallFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/NewCallFragment.kt
index cf4a71677..5a19a6265 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/NewCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/NewCallFragment.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.app.Dialog
 import android.os.Bundle
@@ -58,7 +58,7 @@ class NewCallFragment : GenericFragment() {
     private lateinit var binding: StartCallFragmentBinding
 
     private val viewModel: StartCallViewModel by navGraphViewModels(
-        R.id.voip_nav_graph
+        R.id.call_nav_graph
     )
 
     private lateinit var adapter: ContactsAndSuggestionsListAdapter
diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/OutgoingCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
similarity index 86%
rename from app/src/main/java/org/linphone/ui/voip/fragment/OutgoingCallFragment.kt
rename to app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
index d46186179..0d60bfa06 100644
--- a/app/src/main/java/org/linphone/ui/voip/fragment/OutgoingCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.fragment
+package org.linphone.ui.call.fragment
 
 import android.os.Bundle
 import android.os.SystemClock
@@ -26,12 +26,12 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.UiThread
 import androidx.lifecycle.ViewModelProvider
-import org.linphone.databinding.VoipOutgoingCallFragmentBinding
-import org.linphone.ui.voip.viewmodel.CurrentCallViewModel
+import org.linphone.databinding.CallOutgoingFragmentBinding
+import org.linphone.ui.call.viewmodel.CurrentCallViewModel
 
 @UiThread
 class OutgoingCallFragment : GenericCallFragment() {
-    private lateinit var binding: VoipOutgoingCallFragmentBinding
+    private lateinit var binding: CallOutgoingFragmentBinding
 
     private lateinit var callViewModel: CurrentCallViewModel
 
@@ -40,7 +40,7 @@ class OutgoingCallFragment : GenericCallFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = VoipOutgoingCallFragmentBinding.inflate(layoutInflater)
+        binding = CallOutgoingFragmentBinding.inflate(layoutInflater)
         return binding.root
     }
 
diff --git a/app/src/main/java/org/linphone/ui/voip/model/AudioDeviceModel.kt b/app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt
similarity index 97%
rename from app/src/main/java/org/linphone/ui/voip/model/AudioDeviceModel.kt
rename to app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt
index 06d6151a0..6265d3f44 100644
--- a/app/src/main/java/org/linphone/ui/voip/model/AudioDeviceModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.model
+package org.linphone.ui.call.model
 
 import org.linphone.core.AudioDevice
 
diff --git a/app/src/main/java/org/linphone/ui/voip/model/CallModel.kt b/app/src/main/java/org/linphone/ui/call/model/CallModel.kt
similarity index 98%
rename from app/src/main/java/org/linphone/ui/voip/model/CallModel.kt
rename to app/src/main/java/org/linphone/ui/call/model/CallModel.kt
index 902ae262a..ead266f46 100644
--- a/app/src/main/java/org/linphone/ui/voip/model/CallModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/model/CallModel.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.model
+package org.linphone.ui.call.model
 
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/org/linphone/ui/voip/model/ZrtpSasConfirmationDialogModel.kt b/app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt
similarity index 98%
rename from app/src/main/java/org/linphone/ui/voip/model/ZrtpSasConfirmationDialogModel.kt
rename to app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt
index 222629b7b..2e7e973e7 100644
--- a/app/src/main/java/org/linphone/ui/voip/model/ZrtpSasConfirmationDialogModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.model
+package org.linphone.ui.call.model
 
 import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/org/linphone/ui/voip/view/RoundCornersTextureView.kt b/app/src/main/java/org/linphone/ui/call/view/RoundCornersTextureView.kt
similarity index 97%
rename from app/src/main/java/org/linphone/ui/voip/view/RoundCornersTextureView.kt
rename to app/src/main/java/org/linphone/ui/call/view/RoundCornersTextureView.kt
index a053545fd..35a49f3ac 100644
--- a/app/src/main/java/org/linphone/ui/voip/view/RoundCornersTextureView.kt
+++ b/app/src/main/java/org/linphone/ui/call/view/RoundCornersTextureView.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.view
+package org.linphone.ui.call.view
 
 import android.content.Context
 import android.graphics.Outline
@@ -76,7 +76,7 @@ class RoundCornersTextureView : CaptureTextureView {
                     getFloat(
                         R.styleable.RoundCornersTextureView_radius,
                         context.resources.getDimension(
-                            R.dimen.in_call_round_corners_texture_view_radius
+                            R.dimen.call_round_corners_texture_view_radius
                         )
                     )
                 } catch (nfe: NumberFormatException) { 0f }
diff --git a/app/src/main/java/org/linphone/ui/voip/viewmodel/CallsViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt
similarity index 97%
rename from app/src/main/java/org/linphone/ui/voip/viewmodel/CallsViewModel.kt
rename to app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt
index 11334ad7f..5afd5644c 100644
--- a/app/src/main/java/org/linphone/ui/voip/viewmodel/CallsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.viewmodel
+package org.linphone.ui.call.viewmodel
 
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
@@ -30,7 +30,7 @@ import org.linphone.core.Call
 import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
 import org.linphone.core.tools.Log
-import org.linphone.ui.voip.model.CallModel
+import org.linphone.ui.call.model.CallModel
 import org.linphone.utils.Event
 
 class CallsViewModel @UiThread constructor() : ViewModel() {
@@ -86,7 +86,7 @@ class CallsViewModel @UiThread constructor() : ViewModel() {
     private val coreListener = object : CoreListenerStub() {
         @WorkerThread
         override fun onLastCallEnded(core: Core) {
-            Log.i("$TAG No more call, leaving VoIP activity")
+            Log.i("$TAG No more call, leaving Call activity")
             noMoreCallEvent.postValue(Event(true))
         }
 
@@ -192,7 +192,7 @@ class CallsViewModel @UiThread constructor() : ViewModel() {
                     else -> {}
                 }
             } else {
-                Log.w("$TAG No call found, leaving VoIP activity")
+                Log.w("$TAG No call found, leaving Call activity")
                 noMoreCallEvent.postValue(Event(true))
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
similarity index 99%
rename from app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
rename to app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index ba87118d9..cfef191e9 100644
--- a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.viewmodel
+package org.linphone.ui.call.viewmodel
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -35,8 +35,8 @@ import org.linphone.core.CallListenerStub
 import org.linphone.core.MediaDirection
 import org.linphone.core.MediaEncryption
 import org.linphone.core.tools.Log
+import org.linphone.ui.call.model.AudioDeviceModel
 import org.linphone.ui.main.contacts.model.ContactAvatarModel
-import org.linphone.ui.voip.model.AudioDeviceModel
 import org.linphone.utils.AppUtils
 import org.linphone.utils.AudioRouteUtils
 import org.linphone.utils.Event
diff --git a/app/src/main/java/org/linphone/ui/voip/viewmodel/SharedCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt
similarity index 96%
rename from app/src/main/java/org/linphone/ui/voip/viewmodel/SharedCallViewModel.kt
rename to app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt
index e0533c468..0b2033866 100644
--- a/app/src/main/java/org/linphone/ui/voip/viewmodel/SharedCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.voip.viewmodel
+package org.linphone.ui.call.viewmodel
 
 import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/org/linphone/ui/main/history/adapter/ContactsAndSuggestionsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/history/adapter/ContactsAndSuggestionsListAdapter.kt
index da2ca138f..dac7243e7 100644
--- a/app/src/main/java/org/linphone/ui/main/history/adapter/ContactsAndSuggestionsListAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/adapter/ContactsAndSuggestionsListAdapter.kt
@@ -52,9 +52,9 @@ class ContactsAndSuggestionsListAdapter(
     override fun getHeaderViewForPosition(context: Context, position: Int): View {
         val binding = StartCallSuggestionListDecorationBinding.inflate(LayoutInflater.from(context))
         binding.header.text = if (position == 0) {
-            AppUtils.getString(R.string.call_start_contacts_list_title)
+            AppUtils.getString(R.string.history_call_start_contacts_list_title)
         } else {
-            AppUtils.getString(R.string.call_start_suggestions_list_title)
+            AppUtils.getString(R.string.history_call_start_suggestions_list_title)
         }
         return binding.root
     }
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index 0ede06567..f6f97596f 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -54,10 +54,10 @@ import org.linphone.BR
 import org.linphone.R
 import org.linphone.core.ConsolidatedPresence
 import org.linphone.core.tools.Log
+import org.linphone.ui.call.CallActivity
 import org.linphone.ui.main.MainActivity
 import org.linphone.ui.main.contacts.model.ContactAvatarModel
 import org.linphone.ui.main.model.AccountModel
-import org.linphone.ui.voip.VoipActivity
 
 /**
  * This file contains all the data binding necessary for the app
@@ -86,8 +86,8 @@ fun <T> setEntries(
             // This is a bit hacky...
             if (viewGroup.context as? MainActivity != null) {
                 binding.lifecycleOwner = viewGroup.context as MainActivity
-            } else if (viewGroup.context as? VoipActivity != null) {
-                binding.lifecycleOwner = viewGroup.context as VoipActivity
+            } else if (viewGroup.context as? CallActivity != null) {
+                binding.lifecycleOwner = viewGroup.context as CallActivity
             } else {
                 Log.e(
                     "[Data Binding Utils] Failed to cast viewGroup's context as an Activity, lifecycle owner hasn't be set!"
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
index 25c956d84..d21590247 100644
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt
@@ -46,10 +46,10 @@ import org.linphone.databinding.DialogRemoveAllCallLogsBinding
 import org.linphone.databinding.DialogRemoveCallLogsBinding
 import org.linphone.ui.assistant.model.AcceptConditionsAndPolicyDialogModel
 import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
+import org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
 import org.linphone.ui.main.contacts.model.TrustCallDialogModel
 import org.linphone.ui.main.history.model.ConfirmationDialogModel
-import org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel
 
 class DialogUtils {
     companion object {
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index 558158c13..5369f4d6f 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -202,22 +202,22 @@ class LinphoneUtils {
         fun callStateToString(state: Call.State): String {
             return when (state) {
                 Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> {
-                    AppUtils.getString(R.string.voip_call_state_incoming_received)
+                    AppUtils.getString(R.string.call_state_incoming_received)
                 }
                 Call.State.OutgoingInit, Call.State.OutgoingProgress -> {
-                    AppUtils.getString(R.string.voip_call_state_outgoing_progress)
+                    AppUtils.getString(R.string.call_state_outgoing_progress)
                 }
                 Call.State.OutgoingRinging, Call.State.OutgoingEarlyMedia -> {
-                    AppUtils.getString(R.string.voip_call_state_outgoing_ringing)
+                    AppUtils.getString(R.string.call_state_outgoing_ringing)
                 }
                 Call.State.Connected, Call.State.StreamsRunning, Call.State.Updating, Call.State.UpdatedByRemote -> {
-                    AppUtils.getString(R.string.voip_call_state_connected)
+                    AppUtils.getString(R.string.call_state_connected)
                 }
                 Call.State.Pausing, Call.State.Paused, Call.State.PausedByRemote -> {
-                    AppUtils.getString(R.string.voip_call_state_paused)
+                    AppUtils.getString(R.string.call_state_paused)
                 }
                 Call.State.End, Call.State.Released, Call.State.Error -> {
-                    AppUtils.getString(R.string.voip_call_state_ended)
+                    AppUtils.getString(R.string.call_state_ended)
                 }
                 else -> {
                     // TODO: handle other states
diff --git a/app/src/main/res/layout-land/voip_call_extra_actions.xml b/app/src/main/res/layout-land/call_extra_actions.xml
similarity index 80%
rename from app/src/main/res/layout-land/voip_call_extra_actions.xml
rename to app/src/main/res/layout-land/call_extra_actions.xml
index bd25f7824..825bae7f5 100644
--- a/app/src/main/res/layout-land/voip_call_extra_actions.xml
+++ b/app/src/main/res/layout-land/call_extra_actions.xml
@@ -16,22 +16,22 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/in_call_all_actions_menu_height"
+        android:layout_height="@dimen/call_all_actions_menu_height"
         android:background="@color/grey_900"
         app:behavior_hideable="false"
-        app:behavior_peekHeight="@dimen/in_call_main_actions_menu_height"
+        app:behavior_peekHeight="@dimen/call_main_actions_menu_height"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <include
             android:id="@+id/main_actions"
-            layout="@layout/voip_call_main_actions"
+            layout="@layout/call_main_actions"
             android:layout_width="0dp"
-            android:layout_height="@dimen/in_call_main_actions_menu_height"
+            android:layout_height="@dimen/call_main_actions_menu_height"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             bind:showExpandToggle="@{true}"
@@ -41,10 +41,10 @@
             android:id="@+id/transfer"
             android:onClick="@{transferClickListener}"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/transfer"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/transfer_label"
@@ -56,10 +56,10 @@
             android:id="@+id/new_call"
             android:onClick="@{newCallClickListener}"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/phone_plus"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/new_call_label"
@@ -71,10 +71,10 @@
             android:id="@+id/history_list"
             android:onClick="@{callsListClickListener}"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/calls_list"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/calls_list_label"
@@ -85,10 +85,10 @@
         <ImageView
             android:id="@+id/dialer"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/dialer"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/dialer_label"
@@ -99,10 +99,10 @@
         <ImageView
             android:id="@+id/chat"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/chat_dots"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/chat_label"
@@ -113,10 +113,10 @@
         <ImageView
             android:id="@+id/pause_call"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/pause_call"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/pause_call_label"
@@ -127,10 +127,10 @@
         <ImageView
             android:id="@+id/record_call"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:background="@drawable/in_call_button_background"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/record"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/record_call_label"
@@ -145,7 +145,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_call_transfer"
+            android:text="@string/call_action_transfer"
             app:layout_constraintEnd_toStartOf="@id/new_call_label"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/transfer"/>
@@ -157,7 +157,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_start_new_call"
+            android:text="@string/call_action_start_new_call"
             app:layout_constraintEnd_toStartOf="@id/calls_list_label"
             app:layout_constraintStart_toEndOf="@id/transfer_label"
             app:layout_constraintTop_toBottomOf="@id/new_call"/>
@@ -169,7 +169,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_go_to_calls_list"
+            android:text="@string/call_action_go_to_calls_list"
             app:layout_constraintEnd_toStartOf="@id/dialer_label"
             app:layout_constraintStart_toEndOf="@id/new_call_label"
             app:layout_constraintTop_toBottomOf="@id/history_list"/>
@@ -180,7 +180,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_show_dialer"
+            android:text="@string/call_action_show_dialer"
             app:layout_constraintEnd_toStartOf="@id/chat_label"
             app:layout_constraintStart_toEndOf="@id/calls_list_label"
             app:layout_constraintTop_toBottomOf="@id/chat" />
@@ -191,7 +191,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_show_messages"
+            android:text="@string/call_action_show_messages"
             app:layout_constraintEnd_toStartOf="@id/pause_call_label"
             app:layout_constraintStart_toEndOf="@id/dialer_label"
             app:layout_constraintTop_toBottomOf="@id/chat" />
@@ -202,7 +202,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_pause_call"
+            android:text="@string/call_action_pause_call"
             app:layout_constraintEnd_toStartOf="@id/record_call_label"
             app:layout_constraintStart_toEndOf="@id/chat_label"
             app:layout_constraintTop_toBottomOf="@id/pause_call" />
@@ -213,7 +213,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_record_call"
+            android:text="@string/call_action_record_call"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/pause_call_label"
             app:layout_constraintTop_toBottomOf="@id/record_call" />
diff --git a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
index 15f03753e..a753a3112 100644
--- a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
+++ b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
@@ -8,7 +8,7 @@
         <import type="android.graphics.Typeface" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel" />
+            type="org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -140,7 +140,7 @@
             android:paddingBottom="13dp"
             android:paddingEnd="20dp"
             android:paddingStart="20dp"
-            android:text="@string/in_call_zrtp_sas_validation_skip"
+            android:text="@string/call_zrtp_sas_validation_skip"
             android:textSize="13sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/history_list_fragment.xml b/app/src/main/res/layout-land/history_list_fragment.xml
index ac6758236..1dee3bdc3 100644
--- a/app/src/main/res/layout-land/history_list_fragment.xml
+++ b/app/src/main/res/layout-land/history_list_fragment.xml
@@ -96,7 +96,7 @@
             android:id="@+id/no_calls_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/calls_list_empty_history"
+            android:text="@string/history_list_empty_history"
             app:layout_constraintBottom_toTopOf="@id/background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
diff --git a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
index 519539e3d..a8154ce3a 100644
--- a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
+++ b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
@@ -17,7 +17,7 @@
         android:layout_height="match_parent"
         android:background="@color/black">
 
-        <org.linphone.ui.voip.view.RoundCornersTextureView
+        <org.linphone.ui.call.view.RoundCornersTextureView
             android:id="@+id/qr_code_preview"
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/voip_active_call_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml
similarity index 91%
rename from app/src/main/res/layout/voip_active_call_fragment.xml
rename to app/src/main/res/layout/call_active_fragment.xml
index 6e1206c98..54cb4a5f0 100644
--- a/app/src/main/res/layout/voip_active_call_fragment.xml
+++ b/app/src/main/res/layout/call_active_fragment.xml
@@ -16,7 +16,7 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -50,7 +50,7 @@
                 android:layout_height="0dp"
                 android:layout_marginStart="12dp"
                 android:layout_marginEnd="12dp"
-                android:layout_marginBottom="@dimen/in_call_main_actions_menu_height"
+                android:layout_marginBottom="@dimen/call_main_actions_menu_height"
                 app:layout_constraintTop_toBottomOf="@id/call_direction_label"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -117,12 +117,12 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
-            <org.linphone.ui.voip.view.RoundCornersTextureView
+            <org.linphone.ui.call.view.RoundCornersTextureView
                 android:id="@+id/remote_video_surface"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/in_call_main_actions_menu_height, default=@dimen/in_call_main_actions_menu_height}"
-                android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/in_call_top_bar_info_height, default=@dimen/in_call_top_bar_info_height}"
+                android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_main_actions_menu_height, default=@dimen/call_main_actions_menu_height}"
+                android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_top_bar_info_height, default=@dimen/call_top_bar_info_height}"
                 android:onClick="@{() -> viewModel.toggleFullScreen()}"
                 android:visibility="@{viewModel.isVideoEnabled ? View.VISIBLE : View.GONE}"
                 app:layout_constraintTop_toTopOf="parent"
@@ -149,10 +149,10 @@
                 app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/in_call_header_style"
+                style="@style/call_header_style"
                 android:id="@+id/call_direction_label"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/in_call_top_bar_text_height"
+                android:layout_height="@dimen/call_top_bar_text_height"
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
@@ -162,20 +162,20 @@
                 app:layout_constraintBottom_toTopOf="@id/background"/>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/in_call_header_style"
+                style="@style/call_header_style"
                 android:id="@+id/separator"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/in_call_top_bar_text_height"
+                android:layout_height="@dimen/call_top_bar_text_height"
                 android:layout_marginStart="5dp"
                 android:text="@string/vertical_separator"
                 app:layout_constraintStart_toEndOf="@id/call_direction_label"
                 app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
 
             <Chronometer
-                style="@style/in_call_header_style"
+                style="@style/call_header_style"
                 android:id="@+id/chronometer"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/in_call_top_bar_text_height"
+                android:layout_height="@dimen/call_top_bar_text_height"
                 android:layout_marginStart="5dp"
                 app:layout_constraintStart_toEndOf="@id/separator"
                 app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
@@ -183,8 +183,8 @@
             <ImageView
                 android:onClick="@{() -> viewModel.switchCamera()}"
                 android:id="@+id/switch_camera"
-                android:layout_width="@dimen/in_call_top_bar_info_height"
-                android:layout_height="@dimen/in_call_top_bar_info_height"
+                android:layout_width="@dimen/call_top_bar_info_height"
+                android:layout_height="@dimen/call_top_bar_info_height"
                 android:padding="10dp"
                 android:layout_marginEnd="10dp"
                 android:src="@drawable/camera_rotate"
@@ -194,7 +194,7 @@
                 app:layout_constraintBottom_toBottomOf="@id/call_direction_label"
                 app:layout_constraintEnd_toEndOf="parent" />
 
-            <org.linphone.ui.voip.view.RoundCornersTextureView
+            <org.linphone.ui.call.view.RoundCornersTextureView
                 android:id="@+id/local_preview_video_surface"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -213,7 +213,7 @@
         <include
             android:id="@+id/bottom_bar"
             android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
-            layout="@layout/voip_call_extra_actions"
+            layout="@layout/call_extra_actions"
             bind:viewModel="@{viewModel}"
             bind:transferClickListener="@{transferClickListener}"
             bind:newCallClickListener="@{newCallClickListener}"
diff --git a/app/src/main/res/layout/voip_activity.xml b/app/src/main/res/layout/call_activity.xml
similarity index 88%
rename from app/src/main/res/layout/voip_activity.xml
rename to app/src/main/res/layout/call_activity.xml
index 3f9cdc158..d4cce75c9 100644
--- a/app/src/main/res/layout/voip_activity.xml
+++ b/app/src/main/res/layout/call_activity.xml
@@ -7,26 +7,26 @@
         <import type="android.view.View" />
         <variable
             name="callViewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:keepScreenOn="true"
-        tools:context=".ui.voip.VoipActivity">
+        tools:context=".ui.call.CallActivity">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
             <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/voip_nav_container"
+                android:id="@+id/call_nav_container"
                 android:name="androidx.navigation.fragment.NavHostFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:defaultNavHost="true"
-                app:navGraph="@navigation/voip_nav_graph"/>
+                app:navGraph="@navigation/call_nav_graph"/>
 
             <LinearLayout
                 android:id="@+id/toasts_area"
diff --git a/app/src/main/res/layout/voip_audio_device_list_cell.xml b/app/src/main/res/layout/call_audio_device_list_cell.xml
similarity index 94%
rename from app/src/main/res/layout/voip_audio_device_list_cell.xml
rename to app/src/main/res/layout/call_audio_device_list_cell.xml
index 8cfd98ffa..f349da51e 100644
--- a/app/src/main/res/layout/voip_audio_device_list_cell.xml
+++ b/app/src/main/res/layout/call_audio_device_list_cell.xml
@@ -6,7 +6,7 @@
         <import type="android.view.View" />
         <variable
             name="model"
-            type="org.linphone.ui.voip.model.AudioDeviceModel" />
+            type="org.linphone.ui.call.model.AudioDeviceModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/voip_audio_devices_menu.xml b/app/src/main/res/layout/call_audio_devices_menu.xml
similarity index 87%
rename from app/src/main/res/layout/voip_audio_devices_menu.xml
rename to app/src/main/res/layout/call_audio_devices_menu.xml
index 5ab80e08c..65cbb39a9 100644
--- a/app/src/main/res/layout/voip_audio_devices_menu.xml
+++ b/app/src/main/res/layout/call_audio_devices_menu.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         entries="@{devices}"
-        layout="@{@layout/voip_audio_device_list_cell}">
+        layout="@{@layout/call_audio_device_list_cell}">
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/voip_call_extra_actions.xml b/app/src/main/res/layout/call_extra_actions.xml
similarity index 80%
rename from app/src/main/res/layout/voip_call_extra_actions.xml
rename to app/src/main/res/layout/call_extra_actions.xml
index 626358294..9f9f8e954 100644
--- a/app/src/main/res/layout/voip_call_extra_actions.xml
+++ b/app/src/main/res/layout/call_extra_actions.xml
@@ -16,22 +16,22 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/in_call_all_actions_menu_height"
+        android:layout_height="@dimen/call_all_actions_menu_height"
         android:background="@color/grey_900"
         app:behavior_hideable="false"
-        app:behavior_peekHeight="@dimen/in_call_main_actions_menu_height"
+        app:behavior_peekHeight="@dimen/call_main_actions_menu_height"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <include
             android:id="@+id/main_actions"
-            layout="@layout/voip_call_main_actions"
+            layout="@layout/call_main_actions"
             android:layout_width="0dp"
-            android:layout_height="@dimen/in_call_main_actions_menu_height"
+            android:layout_height="@dimen/call_main_actions_menu_height"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             bind:showExpandToggle="@{true}"
@@ -41,9 +41,9 @@
             android:id="@+id/transfer"
             android:onClick="@{transferClickListener}"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/transfer"
             app:tint="@color/white"
@@ -56,9 +56,9 @@
             android:id="@+id/new_call"
             android:onClick="@{newCallClickListener}"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/phone_plus"
             app:tint="@color/white"
@@ -71,9 +71,9 @@
             android:id="@+id/history_list"
             android:onClick="@{callsListClickListener}"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/calls_list"
             app:tint="@color/white"
@@ -85,9 +85,9 @@
         <ImageView
             android:id="@+id/dialer"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/dialer"
             app:tint="@color/white"
@@ -99,9 +99,9 @@
         <ImageView
             android:id="@+id/chat"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/chat_dots"
             app:tint="@color/white"
@@ -113,9 +113,9 @@
         <ImageView
             android:id="@+id/pause_call"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/pause_call"
             app:tint="@color/white"
@@ -127,9 +127,9 @@
         <ImageView
             android:id="@+id/record_call"
             android:layout_width="0dp"
-            android:layout_height="@dimen/voip_button_size"
-            android:layout_marginTop="@dimen/voip_extra_button_top_margin"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:layout_height="@dimen/call_button_size"
+            android:layout_marginTop="@dimen/call_extra_button_top_margin"
+            android:padding="@dimen/call_button_icon_padding"
             android:background="@drawable/in_call_button_background"
             android:src="@drawable/record"
             app:tint="@color/white"
@@ -144,7 +144,7 @@
             android:onClick="@{transferClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/voip_action_call_transfer"
+            android:text="@string/call_action_transfer"
             app:layout_constraintTop_toBottomOf="@id/transfer"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/new_call_label"/>
@@ -155,7 +155,7 @@
             android:onClick="@{newCallClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/voip_action_start_new_call"
+            android:text="@string/call_action_start_new_call"
             app:layout_constraintTop_toBottomOf="@id/new_call"
             app:layout_constraintStart_toEndOf="@id/transfer_label"
             app:layout_constraintEnd_toStartOf="@id/calls_list_label" />
@@ -166,7 +166,7 @@
             android:onClick="@{callsListClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/voip_action_go_to_calls_list"
+            android:text="@string/call_action_go_to_calls_list"
             app:layout_constraintTop_toBottomOf="@id/history_list"
             app:layout_constraintStart_toEndOf="@id/new_call_label"
             app:layout_constraintEnd_toStartOf="@id/dialer_label" />
@@ -176,7 +176,7 @@
             android:id="@+id/dialer_label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/voip_action_show_dialer"
+            android:text="@string/call_action_show_dialer"
             app:layout_constraintTop_toBottomOf="@id/dialer"
             app:layout_constraintStart_toEndOf="@id/calls_list_label"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -187,7 +187,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_show_messages"
+            android:text="@string/call_action_show_messages"
             app:layout_constraintTop_toBottomOf="@id/chat"
             app:layout_constraintStart_toStartOf="@id/transfer_label"
             app:layout_constraintEnd_toEndOf="@id/transfer_label" />
@@ -198,7 +198,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_pause_call"
+            android:text="@string/call_action_pause_call"
             app:layout_constraintTop_toBottomOf="@id/pause_call"
             app:layout_constraintStart_toStartOf="@id/new_call_label"
             app:layout_constraintEnd_toEndOf="@id/new_call_label" />
@@ -209,7 +209,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/voip_action_record_call"
+            android:text="@string/call_action_record_call"
             app:layout_constraintTop_toBottomOf="@id/record_call"
             app:layout_constraintStart_toStartOf="@id/calls_list_label"
             app:layout_constraintEnd_toEndOf="@id/calls_list_label" />
diff --git a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml b/app/src/main/res/layout/call_incoming_bottom_bar.xml
similarity index 91%
rename from app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
rename to app/src/main/res/layout/call_incoming_bottom_bar.xml
index abc774770..97f39fb1f 100644
--- a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
+++ b/app/src/main/res/layout/call_incoming_bottom_bar.xml
@@ -6,7 +6,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -19,7 +19,7 @@
         <ImageView
             android:id="@+id/hang_up"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:layout_marginEnd="30dp"
             android:background="@drawable/squircle_red_button_background"
             android:onClick="@{() -> viewModel.hangUp()}"
@@ -37,7 +37,7 @@
         <ImageView
             android:id="@+id/answer_call"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:background="@drawable/squircle_green_button_background"
             android:onClick="@{() -> viewModel.answer()}"
             android:paddingStart="30dp"
diff --git a/app/src/main/res/layout/voip_incoming_call_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml
similarity index 95%
rename from app/src/main/res/layout/voip_incoming_call_fragment.xml
rename to app/src/main/res/layout/call_incoming_fragment.xml
index bd45566cf..c1bebf2dd 100644
--- a/app/src/main/res/layout/voip_incoming_call_fragment.xml
+++ b/app/src/main/res/layout/call_incoming_fragment.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -27,10 +27,10 @@
             app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/in_call_header_style"
+            style="@style/call_header_style"
             android:id="@+id/call_direction_label"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/in_call_top_bar_text_height"
+            android:layout_height="@dimen/call_top_bar_text_height"
             android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
@@ -119,7 +119,7 @@
         <include
             bind:viewModel="@{viewModel}"
             android:id="@+id/bottom_bar"
-            layout="@layout/voip_incoming_call_bottom_bar"
+            layout="@layout/call_incoming_bottom_bar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/voip_call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml
similarity index 98%
rename from app/src/main/res/layout/voip_call_list_cell.xml
rename to app/src/main/res/layout/call_list_cell.xml
index 66c2d9d11..a3dda8d77 100644
--- a/app/src/main/res/layout/voip_call_list_cell.xml
+++ b/app/src/main/res/layout/call_list_cell.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="model"
-            type="org.linphone.ui.voip.model.CallModel" />
+            type="org.linphone.ui.call.model.CallModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/voip_call_main_actions.xml b/app/src/main/res/layout/call_main_actions.xml
similarity index 84%
rename from app/src/main/res/layout/voip_call_main_actions.xml
rename to app/src/main/res/layout/call_main_actions.xml
index cae3a1548..dc2bfda25 100644
--- a/app/src/main/res/layout/voip_call_main_actions.xml
+++ b/app/src/main/res/layout/call_main_actions.xml
@@ -6,7 +6,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
         <variable
             name="showExpandToggle"
             type="Boolean" />
@@ -14,7 +14,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/in_call_main_actions_menu_height"
+        android:layout_height="@dimen/call_main_actions_menu_height"
         android:paddingBottom="5dp"
         android:background="@color/grey_900">
 
@@ -34,7 +34,7 @@
             android:onClick="@{() -> viewModel.hangUp()}"
             android:id="@+id/hang_up"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:layout_marginStart="16dp"
             android:paddingStart="30dp"
             android:paddingEnd="30dp"
@@ -49,10 +49,10 @@
         <ImageView
             android:onClick="@{() -> viewModel.toggleVideo()}"
             android:id="@+id/toggle_video"
-            android:layout_width="@dimen/voip_button_size"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_width="@dimen/call_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:layout_marginEnd="16dp"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@{viewModel.isVideoEnabled() ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
             android:background="@drawable/in_call_button_background"
             app:tint="@color/white"
@@ -65,10 +65,10 @@
         <ImageView
             android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
             android:id="@+id/toggle_mute_mic"
-            android:layout_width="@dimen/voip_button_size"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_width="@dimen/call_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:layout_marginEnd="16dp"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}"
             android:background="@drawable/in_call_button_background"
             app:tint="@color/white"
@@ -79,10 +79,10 @@
         <ImageView
             android:onClick="@{() -> viewModel.changeAudioOutputDevice()}"
             android:id="@+id/change_audio_output"
-            android:layout_width="@dimen/voip_button_size"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_width="@dimen/call_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:layout_marginEnd="16dp"
-            android:padding="@dimen/voip_button_icon_padding"
+            android:padding="@dimen/call_button_icon_padding"
             android:src="@{viewModel.isHeadsetEnabled ? @drawable/headset : viewModel.isBluetoothEnabled ? @drawable/bluetooth : viewModel.isSpeakerEnabled ? @drawable/speaker_high : @drawable/speaker_slash, default=@drawable/speaker_slash}"
             android:background="@drawable/in_call_button_background"
             app:tint="@color/white"
diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml
similarity index 95%
rename from app/src/main/res/layout/voip_outgoing_call_fragment.xml
rename to app/src/main/res/layout/call_outgoing_fragment.xml
index c1735e2c2..3dbf6c6bf 100644
--- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml
+++ b/app/src/main/res/layout/call_outgoing_fragment.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -27,10 +27,10 @@
             app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/in_call_header_style"
+            style="@style/call_header_style"
             android:id="@+id/call_direction_label"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/in_call_top_bar_text_height"
+            android:layout_height="@dimen/call_top_bar_text_height"
             android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
@@ -134,9 +134,9 @@
             bind:viewModel="@{viewModel}"
             bind:showExpandToggle="@{false}"
             android:id="@+id/bottom_bar"
-            layout="@layout/voip_call_main_actions"
+            layout="@layout/call_main_actions"
             android:layout_width="0dp"
-            android:layout_height="@dimen/in_call_main_actions_menu_height"
+            android:layout_height="@dimen/call_main_actions_menu_height"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/voip_calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml
similarity index 92%
rename from app/src/main/res/layout/voip_calls_list_fragment.xml
rename to app/src/main/res/layout/calls_list_fragment.xml
index 8782e9e56..30822bc76 100644
--- a/app/src/main/res/layout/voip_calls_list_fragment.xml
+++ b/app/src/main/res/layout/calls_list_fragment.xml
@@ -10,7 +10,7 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.viewmodel.CallsViewModel" />
+            type="org.linphone.ui.call.viewmodel.CallsViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -38,7 +38,7 @@
             android:layout_height="@dimen/top_bar_height"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:text="@string/voip_calls_list_title"
+            android:text="@string/calls_list_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/back"
             app:layout_constraintTop_toTopOf="parent"/>
@@ -54,7 +54,7 @@
             app:layout_constraintTop_toBottomOf="@id/title"
             app:layout_constraintBottom_toBottomOf="parent"
             entries="@{viewModel.calls}"
-            layout="@{@layout/voip_call_list_cell}"/>
+            layout="@{@layout/call_list_cell}"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
index 0db2274f1..1e12f8922 100644
--- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
+++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
@@ -8,7 +8,7 @@
         <import type="android.graphics.Typeface" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel" />
+            type="org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -141,7 +141,7 @@
             android:paddingBottom="13dp"
             android:paddingEnd="20dp"
             android:paddingStart="20dp"
-            android:text="@string/in_call_zrtp_sas_validation_skip"
+            android:text="@string/call_zrtp_sas_validation_skip"
             android:textSize="13sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/history_contact_fragment.xml b/app/src/main/res/layout/history_contact_fragment.xml
index 3144462e0..5e3a566fd 100644
--- a/app/src/main/res/layout/history_contact_fragment.xml
+++ b/app/src/main/res/layout/history_contact_fragment.xml
@@ -43,7 +43,7 @@
             android:layout_height="@dimen/top_bar_height"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:text="@string/call_history_title"
+            android:text="@string/history_title"
             app:layout_constraintEnd_toStartOf="@id/menu"
             app:layout_constraintStart_toEndOf="@id/back"
             app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index 598bb5c7d..096960834 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -96,7 +96,7 @@
             android:id="@+id/no_calls_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/calls_list_empty_history"
+            android:text="@string/history_list_empty_history"
             app:layout_constraintBottom_toTopOf="@id/background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml
index 0878aa12c..2998aafef 100644
--- a/app/src/main/res/layout/start_call_fragment.xml
+++ b/app/src/main/res/layout/start_call_fragment.xml
@@ -48,7 +48,7 @@
                 android:layout_height="@dimen/top_bar_height"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
-                android:text="@string/call_start_title"
+                android:text="@string/history_call_start_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -74,7 +74,7 @@
                 android:drawableStart="@drawable/magnifying_glass"
                 android:drawablePadding="10dp"
                 android:drawableTint="@color/gray_main2_600"
-                android:hint="@string/call_start_search_bar_filter_hint"
+                android:hint="@string/history_call_start_search_bar_filter_hint"
                 android:inputType="textPersonName|textNoSuggestions"
                 android:paddingStart="15dp"
                 android:paddingTop="10dp"
@@ -156,7 +156,7 @@
                 android:layout_marginEnd="16dp"
                 android:drawableEnd="@drawable/caret_right"
                 android:padding="5dp"
-                android:text="@string/call_start_create_group_call"
+                android:text="@string/history_call_start_create_group_call"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 android:visibility="@{viewModel.searchFilter.length() > 0 ? View.GONE : View.VISIBLE}"
@@ -185,7 +185,7 @@
                 android:id="@+id/no_contacts_nor_suggestion_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/call_start_no_suggestion_nor_contact"
+                android:text="@string/history_call_start_no_suggestion_nor_contact"
                 android:gravity="center"
                 android:visibility="@{viewModel.contactsAndSuggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/start_call_numpad.xml b/app/src/main/res/layout/start_call_numpad.xml
index cbb13cc2a..6a08e5aa4 100644
--- a/app/src/main/res/layout/start_call_numpad.xml
+++ b/app/src/main/res/layout/start_call_numpad.xml
@@ -172,7 +172,7 @@
             android:id="@+id/call"
             android:onClick="@{() -> model.onCallClicked()}"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/voip_button_size"
+            android:layout_height="@dimen/call_button_size"
             android:paddingStart="30dp"
             android:paddingTop="15dp"
             android:paddingEnd="30dp"
diff --git a/app/src/main/res/layout/start_call_suggestion_list_decoration.xml b/app/src/main/res/layout/start_call_suggestion_list_decoration.xml
index 56ee6a603..22f623efd 100644
--- a/app/src/main/res/layout/start_call_suggestion_list_decoration.xml
+++ b/app/src/main/res/layout/start_call_suggestion_list_decoration.xml
@@ -15,7 +15,7 @@
         android:paddingStart="21dp"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
-        android:text="@string/call_start_suggestions_list_title"
+        android:text="@string/history_call_start_suggestions_list_title"
         android:gravity="center_vertical"/>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/voip_nav_graph.xml b/app/src/main/res/navigation/call_nav_graph.xml
similarity index 81%
rename from app/src/main/res/navigation/voip_nav_graph.xml
rename to app/src/main/res/navigation/call_nav_graph.xml
index a9d799d7d..3a30e026b 100644
--- a/app/src/main/res/navigation/voip_nav_graph.xml
+++ b/app/src/main/res/navigation/call_nav_graph.xml
@@ -2,14 +2,14 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/voip_nav_graph"
+    android:id="@+id/call_nav_graph"
     app:startDestination="@id/outgoingCallFragment">
 
     <fragment
         android:id="@+id/outgoingCallFragment"
-        android:name="org.linphone.ui.voip.fragment.OutgoingCallFragment"
+        android:name="org.linphone.ui.call.fragment.OutgoingCallFragment"
         android:label="OutgoingCallFragment"
-        tools:layout="@layout/voip_outgoing_call_fragment">
+        tools:layout="@layout/call_outgoing_fragment">
         <action
             android:id="@+id/action_outgoingCallFragment_to_activeCallFragment"
             app:destination="@id/activeCallFragment"
@@ -26,9 +26,9 @@
 
     <fragment
         android:id="@+id/incomingCallFragment"
-        android:name="org.linphone.ui.voip.fragment.IncomingCallFragment"
+        android:name="org.linphone.ui.call.fragment.IncomingCallFragment"
         android:label="IncomingCallFragment"
-        tools:layout="@layout/voip_incoming_call_fragment">
+        tools:layout="@layout/call_incoming_fragment">
         <action
             android:id="@+id/action_incomingCallFragment_to_activeCallFragment"
             app:destination="@id/activeCallFragment"
@@ -45,9 +45,9 @@
 
     <fragment
         android:id="@+id/activeCallFragment"
-        android:name="org.linphone.ui.voip.fragment.ActiveCallFragment"
+        android:name="org.linphone.ui.call.fragment.ActiveCallFragment"
         android:label="ActiveCallFragment"
-        tools:layout="@layout/voip_active_call_fragment">
+        tools:layout="@layout/call_active_fragment">
         <action
             android:id="@+id/action_activeCallFragment_to_newCallFragment"
             app:destination="@id/newCallFragment"
@@ -70,14 +70,14 @@
 
     <fragment
         android:id="@+id/newCallFragment"
-        android:name="org.linphone.ui.voip.fragment.NewCallFragment"
+        android:name="org.linphone.ui.call.fragment.NewCallFragment"
         android:label="NewCallFragment"
         tools:layout="@layout/start_call_fragment" />
 
     <fragment
         android:id="@+id/callsListFragment"
-        android:name="org.linphone.ui.voip.fragment.CallsListFragment"
+        android:name="org.linphone.ui.call.fragment.CallsListFragment"
         android:label="CallsListFragment"
-        tools:layout="@layout/voip_calls_list_fragment" />
+        tools:layout="@layout/calls_list_fragment" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimen.xml b/app/src/main/res/values-land/dimen.xml
index ad3e46775..1194e6838 100644
--- a/app/src/main/res/values-land/dimen.xml
+++ b/app/src/main/res/values-land/dimen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="in_call_main_actions_menu_height">110dp</dimen>
-    <dimen name="in_call_extra_actions_menu_height">125dp</dimen>
-    <dimen name="in_call_all_actions_menu_height">235dp</dimen> <!-- sum of above two -->
+    <dimen name="call_main_actions_menu_height">110dp</dimen>
+    <dimen name="call_extra_actions_menu_height">125dp</dimen>
+    <dimen name="call_all_actions_menu_height">235dp</dimen> <!-- sum of above two -->
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 77bf7ad83..6c7dcec5c 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -32,20 +32,19 @@
     <dimen name="toast_top_margin">70dp</dimen> <!-- 15dp + top_bar_height -->
     <dimen name="toast_elevation">5dp</dimen>
 
-    <dimen name="in_call_top_bar_text_height">28dp</dimen>
-    <dimen name="in_call_top_bar_info_height">48dp</dimen> <!-- Size of top text + top & bottom margins -->
-    <dimen name="in_call_main_actions_menu_height">110dp</dimen>
-    <dimen name="in_call_extra_actions_menu_height">235dp</dimen>
-    <dimen name="in_call_all_actions_menu_height">345dp</dimen> <!-- sum of above two -->
-    <dimen name="in_call_round_corners_texture_view_radius">20dp</dimen>
+    <dimen name="call_top_bar_text_height">28dp</dimen>
+    <dimen name="call_top_bar_info_height">48dp</dimen> <!-- Size of top text + top & bottom margins -->
+    <dimen name="call_main_actions_menu_height">110dp</dimen>
+    <dimen name="call_extra_actions_menu_height">235dp</dimen>
+    <dimen name="call_all_actions_menu_height">345dp</dimen> <!-- sum of above two -->
+    <dimen name="call_round_corners_texture_view_radius">20dp</dimen>
+    <dimen name="call_button_size">55dp</dimen>
+    <dimen name="call_button_icon_padding">15dp</dimen>
+    <dimen name="call_extra_button_top_margin">30dp</dimen>
 
     <dimen name="toast_max_width">400dp</dimen>
     <dimen name="toast_text_max_width">300dp</dimen>
     <dimen name="button_max_width">400dp</dimen>
     <dimen name="dialog_max_width">400dp</dimen>
     <dimen name="text_input_max_width">400dp</dimen>
-
-    <dimen name="voip_button_size">55dp</dimen>
-    <dimen name="voip_button_icon_padding">15dp</dimen>
-    <dimen name="voip_extra_button_top_margin">30dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e363f057f..f54d88a23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -230,15 +230,14 @@
     <string name="menu_delete_selected_item">Delete</string>
     <string name="menu_invite">Invite</string>
 
-    <string name="call_history_title">Call history</string>
-    <string name="call_start_title">New call</string>
-    <string name="call_start_search_bar_filter_hint">Search contact or history call</string>
-    <string name="call_start_create_group_call">Create a group call</string>
-    <string name="call_start_no_suggestion_nor_contact">No suggestion and no contact for the moment…</string>
-    <string name="call_start_contacts_list_title">Contacts</string>
-    <string name="call_start_suggestions_list_title">Suggestions</string>
-
-    <string name="calls_list_empty_history">No call for the moment…</string>
+    <string name="history_title">Call history</string>
+    <string name="history_call_start_title">New call</string>
+    <string name="history_call_start_search_bar_filter_hint">Search contact or history call</string>
+    <string name="history_call_start_create_group_call">Create a group call</string>
+    <string name="history_call_start_no_suggestion_nor_contact">No suggestion and no contact for the moment…</string>
+    <string name="history_call_start_contacts_list_title">Contacts</string>
+    <string name="history_call_start_suggestions_list_title">Suggestions</string>
+    <string name="history_list_empty_history">No call for the moment…</string>
 
     <string name="contacts_list_title">Contacts</string>
     <string name="contacts_list_empty">No contact for the moment…</string>
@@ -275,25 +274,24 @@
 
     <string name="operation_in_progress_overlay">Operation in progress, please wait</string>
 
-    <string name="voip_action_call_transfer">Transfer</string>
-    <string name="voip_action_start_new_call">New call</string>
-    <string name="voip_action_go_to_calls_list">Calls list</string>
-    <string name="voip_action_show_dialer">Dialer</string>
-    <string name="voip_action_show_messages">Messages</string>
-    <string name="voip_action_pause_call">Pause</string>
-    <string name="voip_action_resume_call">Pause</string>
-    <string name="voip_action_record_call">Record</string>
-    <string name="voip_call_state_outgoing_progress">In progress</string>
-    <string name="voip_call_state_outgoing_ringing">Ringing</string>
-    <string name="voip_call_state_incoming_received">Incoming</string>
-    <string name="voip_call_state_connected">Active</string>
-    <string name="voip_call_state_paused">Paused</string>
-    <string name="voip_call_state_ended">Ended</string>
-
-    <string name="voip_calls_list_title">Calls list</string>
+    <string name="call_action_transfer">Transfer</string>
+    <string name="call_action_start_new_call">New call</string>
+    <string name="call_action_go_to_calls_list">Calls list</string>
+    <string name="call_action_show_dialer">Dialer</string>
+    <string name="call_action_show_messages">Messages</string>
+    <string name="call_action_pause_call">Pause</string>
+    <string name="call_action_resume_call">Pause</string>
+    <string name="call_action_record_call">Record</string>
+    <string name="call_state_outgoing_progress">In progress</string>
+    <string name="call_state_outgoing_ringing">Ringing</string>
+    <string name="call_state_incoming_received">Incoming</string>
+    <string name="call_state_connected">Active</string>
+    <string name="call_state_paused">Paused</string>
+    <string name="call_state_ended">Ended</string>
+    <string name="calls_list_title">Calls list</string>
 
     <!-- Keep <u></u> in following strings translations! -->
     <string name="welcome_carousel_skip"><u>Skip</u></string>
     <string name="assistant_forgotten_password"><u>Forgotten password?</u></string>
-    <string name="in_call_zrtp_sas_validation_skip"><u>Skip</u></string>
+    <string name="call_zrtp_sas_validation_skip"><u>Skip</u></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index abd30931e..ef05398b3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">20sp</item>
     </style>
-    <style name="in_call_header_style">
+    <style name="call_header_style">
         <item name="android:fontFamily">@font/noto_sans_800</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">16sp</item>