diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d7d79c2e..04a51f47f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,6 +60,7 @@
         <meta-data
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc"/>
+
         <!--<meta-data
             android:name="androidx.car.app.minCarApiLevel"
             android:value="1"/>-->
@@ -199,7 +200,7 @@
         </service>
 
         <!--<service
-            android:name=".telecom.auto.AAService"
+            android:name=".telecom.auto.AndroidAutoService"
             android:exported="true">
             <intent-filter>
                 <action android:name="androidx.car.app.CarAppService"/>
diff --git a/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoScreen.kt
similarity index 98%
rename from app/src/main/java/org/linphone/telecom/auto/AAScreen.kt
rename to app/src/main/java/org/linphone/telecom/auto/AndroidAutoScreen.kt
index bdc53b6ec..04e1fd0b6 100644
--- a/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt
+++ b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoScreen.kt
@@ -38,7 +38,7 @@ import org.linphone.core.tools.Log
 import org.linphone.utils.AppUtils
 import org.linphone.utils.LinphoneUtils
 
-class AAScreen(context: CarContext) : Screen(context) {
+class AndroidAutoScreen(context: CarContext) : Screen(context) {
     companion object {
         private const val TAG = "[Android Auto Screen]"
     }
diff --git a/app/src/main/java/org/linphone/telecom/auto/AAService.kt b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoService.kt
similarity index 96%
rename from app/src/main/java/org/linphone/telecom/auto/AAService.kt
rename to app/src/main/java/org/linphone/telecom/auto/AndroidAutoService.kt
index 81ffc6de9..dab159b52 100644
--- a/app/src/main/java/org/linphone/telecom/auto/AAService.kt
+++ b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoService.kt
@@ -26,7 +26,7 @@ import androidx.car.app.validation.HostValidator
 import org.linphone.R
 import org.linphone.core.tools.Log
 
-class AAService : CarAppService() {
+class AndroidAutoService : CarAppService() {
     companion object {
         private const val TAG = "[Android Auto Service]"
     }
@@ -55,6 +55,6 @@ class AAService : CarAppService() {
 
     override fun onCreateSession(): Session {
         Log.i("$TAG Creating Session object")
-        return AASession()
+        return AndroidAutoSession()
     }
 }
diff --git a/app/src/main/java/org/linphone/telecom/auto/AASession.kt b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoSession.kt
similarity index 93%
rename from app/src/main/java/org/linphone/telecom/auto/AASession.kt
rename to app/src/main/java/org/linphone/telecom/auto/AndroidAutoSession.kt
index cc3515617..8107be8fe 100644
--- a/app/src/main/java/org/linphone/telecom/auto/AASession.kt
+++ b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoSession.kt
@@ -24,13 +24,13 @@ import androidx.car.app.Screen
 import androidx.car.app.Session
 import org.linphone.core.tools.Log
 
-class AASession : Session() {
+class AndroidAutoSession : Session() {
     companion object {
         private const val TAG = "[Android Auto Session]"
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
         Log.i("$TAG Creating Screen object for host with API level [${carContext.carAppApiLevel}]")
-        return AAScreen(carContext)
+        return AndroidAutoScreen(carContext)
     }
 }