diff --git a/app/build.gradle b/app/build.gradle
index bc2adaa4..e913ee22 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId = 'com.tutpro.baresip'
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode = 12
-        versionName = '2.1.2'
+        versionCode = 13
+        versionName = '2.2'
         externalNativeBuild {
             cmake {
                 cFlags '-DHAVE_INTTYPES_H'
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
index 9fad06ab..38617d4f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
@@ -11,12 +11,12 @@ import android.widget.TextView
 import java.util.*
 
 class CallListAdapter(private val cxt: Context, private val rows: ArrayList<CallRow>) :
-        ArrayAdapter<CallRow>(cxt, R.layout.history_row, rows) {
+        ArrayAdapter<CallRow>(cxt, R.layout.call_row, rows) {
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
         val row = rows[position]
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-        val rowView = inflater.inflate(R.layout.history_row, parent, false)
+        val rowView = inflater.inflate(R.layout.call_row, parent, false)
         val directions = rowView.findViewById(R.id.directions) as LinearLayout
         var count = 1
         for (d in row.directions) {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
index 39e78e51..7d953a0a 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
@@ -26,9 +26,9 @@ class CallsActivity : AppCompatActivity() {
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_history)
+        setContentView(R.layout.activity_calls)
 
-        val listview = findViewById(R.id.history) as ListView
+        val listview = findViewById(R.id.calls) as ListView
 
         val aor = intent.extras.getString("aor")
         aorGenerateHistory(aor)
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_calls.xml
similarity index 95%
rename from app/src/main/res/layout/activity_history.xml
rename to app/src/main/res/layout/activity_calls.xml
index bfb8965b..8754b14a 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_calls.xml
@@ -10,7 +10,7 @@
     tools:context=".CallsActivity">
 
     <ListView
-        android:id="@+id/history"
+        android:id="@+id/calls"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
diff --git a/app/src/main/res/layout/history_row.xml b/app/src/main/res/layout/call_row.xml
similarity index 100%
rename from app/src/main/res/layout/history_row.xml
rename to app/src/main/res/layout/call_row.xml