diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6175cbd1..eb13cd3a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@
             android:parentActivityName=".activities.MainActivity"/>
 
         <activity
-            android:name=".activities.ContactActivity"
+            android:name=".activities.EditContactActivity"
             android:parentActivityName=".activities.MainActivity">
 
             <intent-filter>
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
similarity index 98%
rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
index 29173d97..27e74a1d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
@@ -38,7 +38,7 @@ import com.simplemobiletools.contacts.models.Contact
 import com.simplemobiletools.contacts.models.Email
 import com.simplemobiletools.contacts.models.Event
 import com.simplemobiletools.contacts.models.PhoneNumber
-import kotlinx.android.synthetic.main.activity_contact.*
+import kotlinx.android.synthetic.main.activity_edit_contact.*
 import kotlinx.android.synthetic.main.item_email.view.*
 import kotlinx.android.synthetic.main.item_event.view.*
 import kotlinx.android.synthetic.main.item_phone_number.view.*
@@ -48,7 +48,7 @@ import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
-class ContactActivity : SimpleActivity() {
+class EditContactActivity : SimpleActivity() {
     private val INTENT_TAKE_PHOTO = 1
     private val INTENT_CHOOSE_PHOTO = 2
     private val INTENT_CROP_PHOTO = 3
@@ -67,7 +67,7 @@ class ContactActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_contact)
+        setContentView(R.layout.activity_edit_contact)
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
 
         handlePermission(PERMISSION_READ_CONTACTS) {
@@ -584,7 +584,7 @@ class ContactActivity : SimpleActivity() {
     private fun insertNewContact() {
         isSaving = true
         toast(R.string.inserting)
-        if (ContactsHelper(this@ContactActivity).insertContact(contact!!)) {
+        if (ContactsHelper(this@EditContactActivity).insertContact(contact!!)) {
             finish()
         } else {
             toast(R.string.unknown_error_occurred)
@@ -593,7 +593,7 @@ class ContactActivity : SimpleActivity() {
 
     private fun updateContact(photoUpdateStatus: Int) {
         isSaving = true
-        if (ContactsHelper(this@ContactActivity).updateContact(contact!!, photoUpdateStatus)) {
+        if (ContactsHelper(this@EditContactActivity).updateContact(contact!!, photoUpdateStatus)) {
             finish()
         } else {
             toast(R.string.unknown_error_occurred)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt
index 9ebb5677..86d978a5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt
@@ -13,7 +13,7 @@ import com.simplemobiletools.commons.extensions.getIntValue
 import com.simplemobiletools.commons.extensions.isLollipopPlus
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.contacts.BuildConfig
-import com.simplemobiletools.contacts.activities.ContactActivity
+import com.simplemobiletools.contacts.activities.EditContactActivity
 import com.simplemobiletools.contacts.helpers.CONTACT_ID
 import com.simplemobiletools.contacts.helpers.Config
 import com.simplemobiletools.contacts.models.Contact
@@ -22,7 +22,7 @@ import java.io.File
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
 fun Context.openContact(contact: Contact) {
-    Intent(applicationContext, ContactActivity::class.java).apply {
+    Intent(applicationContext, EditContactActivity::class.java).apply {
         putExtra(CONTACT_ID, contact.id)
         startActivity(this)
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt
index 18df3607..b6afeed0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt
@@ -3,11 +3,11 @@ package com.simplemobiletools.contacts.fragments
 import android.content.Context
 import android.content.Intent
 import android.util.AttributeSet
-import com.simplemobiletools.contacts.activities.ContactActivity
+import com.simplemobiletools.contacts.activities.EditContactActivity
 
 class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
     override fun fabClicked() {
-        Intent(context, ContactActivity::class.java).apply {
+        Intent(context, EditContactActivity::class.java).apply {
             context.startActivity(this)
         }
     }
diff --git a/app/src/main/res/layout/activity_contact.xml b/app/src/main/res/layout/activity_edit_contact.xml
similarity index 100%
rename from app/src/main/res/layout/activity_contact.xml
rename to app/src/main/res/layout/activity_edit_contact.xml