diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index eba9a14cf..702cdadbd 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -371,7 +371,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
     </activity>
 
-    <activity android:name=".videochat.VideochatActivity"
+    <activity android:name=".calls.CallActivity"
               android:label=""
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index c6c3578ae..1574c599f 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -117,7 +117,7 @@ import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.guava.Optional;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;
 import org.thoughtcrime.securesms.video.recode.VideoRecoder;
-import org.thoughtcrime.securesms.videochat.VideochatUtil;
+import org.thoughtcrime.securesms.calls.CallUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -543,7 +543,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       WebxdcActivity.openMaps(this, chatId);
       return true;
     } else if (itemId == R.id.menu_start_call) {
-      VideochatUtil.startCall(this, chatId);
+      CallUtil.startCall(this, chatId);
       return true;
     } else if (itemId == R.id.menu_all_media) {
       handleAllMedia();
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
index c67484595..4c63ebc7b 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
@@ -65,7 +65,7 @@ import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.ConversationAdaptiveActionsToolbar;
-import org.thoughtcrime.securesms.videochat.VideochatUtil;
+import org.thoughtcrime.securesms.calls.CallUtil;
 
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
index bb9fc5e64..7c16139e1 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
@@ -70,7 +70,7 @@ import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
-import org.thoughtcrime.securesms.videochat.VideochatUtil;
+import org.thoughtcrime.securesms.calls.CallUtil;
 
 import java.util.List;
 import java.util.Set;
@@ -996,9 +996,9 @@ public class ConversationItem extends BaseConversationItem
           int chatId = messageRecord.getChatId();
           if (!messageRecord.isOutgoing() && callInfo.state instanceof CallState.Alerting) {
               int callId = messageRecord.getId();
-              VideochatUtil.openCall(getContext(), accId, chatId, callId, callInfo.sdpOffer);
+              CallUtil.openCall(getContext(), accId, chatId, callId, callInfo.sdpOffer);
           } else {
-              VideochatUtil.startCall(getContext(), accId, chatId);
+              CallUtil.startCall(getContext(), accId, chatId);
           }
       }
     }
diff --git a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java b/src/main/java/org/thoughtcrime/securesms/calls/CallActivity.java
similarity index 95%
rename from src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java
rename to src/main/java/org/thoughtcrime/securesms/calls/CallActivity.java
index 92735d09b..d20eb88a7 100644
--- a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/calls/CallActivity.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.videochat;
+package org.thoughtcrime.securesms.calls;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -36,8 +36,8 @@ import java.util.Objects;
 import chat.delta.rpc.Rpc;
 import chat.delta.rpc.RpcException;
 
-public class VideochatActivity extends WebViewActivity implements DcEventCenter.DcEventDelegate {
-  private static final String TAG = VideochatActivity.class.getSimpleName();
+public class CallActivity extends WebViewActivity implements DcEventCenter.DcEventDelegate {
+  private static final String TAG = CallActivity.class.getSimpleName();
 
   public static final String EXTRA_ACCOUNT_ID = "acc_id";
   public static final String EXTRA_CHAT_ID = "chat_id";
@@ -190,7 +190,7 @@ public class VideochatActivity extends WebViewActivity implements DcEventCenter.
 
     @JavascriptInterface
     public String getAvatar() {
-      final Context context = VideochatActivity.this;
+      final Context context = CallActivity.this;
       final DcChat dcChat = dcContext.getChat(chatId);
       if (!TextUtils.isEmpty(dcChat.getProfileImage())) {
         return AvatarUtil.asDataUri(dcChat.getProfileImage());
diff --git a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java b/src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
similarity index 68%
rename from src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
rename to src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
index 209e22896..f84e2385b 100644
--- a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
+++ b/src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.videochat;
+package org.thoughtcrime.securesms.calls;
 
 import android.Manifest;
 import android.app.Activity;
@@ -15,8 +15,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-public class VideochatUtil {
-  private static final String TAG = VideochatUtil.class.getSimpleName();
+public class CallUtil {
+  private static final String TAG = CallUtil.class.getSimpleName();
 
   public static void startCall(Activity activity, int chatId) {
     Permissions.with(activity)
@@ -31,11 +31,11 @@ public class VideochatUtil {
   }
 
   public static void startCall(Context context, int accId, int chatId) {
-    Intent intent = new Intent(context, VideochatActivity.class);
+    Intent intent = new Intent(context, CallActivity.class);
     intent.setAction(Intent.ACTION_VIEW);
-    intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, accId);
-    intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatId);
-    intent.putExtra(VideochatActivity.EXTRA_HASH, "#startCall");
+    intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, accId);
+    intent.putExtra(CallActivity.EXTRA_CHAT_ID, chatId);
+    intent.putExtra(CallActivity.EXTRA_HASH, "#startCall");
     context.startActivity(intent);
   }
 
@@ -48,12 +48,12 @@ public class VideochatUtil {
       Log.e(TAG, "Error", e);
     }
 
-    Intent intent = new Intent(context, VideochatActivity.class);
+    Intent intent = new Intent(context, CallActivity.class);
     intent.setAction(Intent.ACTION_VIEW);
-    intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, accId);
-    intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatId);
-    intent.putExtra(VideochatActivity.EXTRA_CALL_ID, callId);
-    intent.putExtra(VideochatActivity.EXTRA_HASH, hash);
+    intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, accId);
+    intent.putExtra(CallActivity.EXTRA_CHAT_ID, chatId);
+    intent.putExtra(CallActivity.EXTRA_CALL_ID, callId);
+    intent.putExtra(CallActivity.EXTRA_HASH, hash);
     context.startActivity(intent);
   }
 
diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
index be7d0fa0f..4c96c1c2b 100644
--- a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+++ b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
@@ -49,7 +49,7 @@ import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.Pair;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.videochat.VideochatActivity;
+import org.thoughtcrime.securesms.calls.CallActivity;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
@@ -178,12 +178,12 @@ public class NotificationCenter {
           Log.e(TAG, "Error", e);
         }
 
-        Intent intent = new Intent(context, VideochatActivity.class);
+        Intent intent = new Intent(context, CallActivity.class);
         intent.setAction(autoAccept? Intent.ACTION_ANSWER : Intent.ACTION_VIEW);
-        intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, chatData.accountId);
-        intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatData.chatId);
-        intent.putExtra(VideochatActivity.EXTRA_CALL_ID, callId);
-        intent.putExtra(VideochatActivity.EXTRA_HASH, hash);
+        intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, chatData.accountId);
+        intent.putExtra(CallActivity.EXTRA_CHAT_ID, chatData.chatId);
+        intent.putExtra(CallActivity.EXTRA_CALL_ID, callId);
+        intent.putExtra(CallActivity.EXTRA_HASH, hash);
         intent.setPackage(context.getPackageName());
         return TaskStackBuilder.create(context)
             .addNextIntentWithParentStack(chatIntent)