diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
index 03b59d124..6b2b1e984 100644
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@@ -200,8 +200,8 @@
 		B86BD08423399ACF000F5AE3 /* Modal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B86BD08323399ACF000F5AE3 /* Modal.swift */; };
 		B86BD08623399CEF000F5AE3 /* SeedModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B86BD08523399CEF000F5AE3 /* SeedModal.swift */; };
 		B875885A264503A6000E60D0 /* JoinOpenGroupModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8758859264503A6000E60D0 /* JoinOpenGroupModal.swift */; };
-		B877E24226CA12910007970A /* CallVCV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B877E24126CA12910007970A /* CallVCV2.swift */; };
-		B877E24626CA13BA0007970A /* CallVCV2+Camera.swift in Sources */ = {isa = PBXBuildFile; fileRef = B877E24526CA13BA0007970A /* CallVCV2+Camera.swift */; };
+		B877E24226CA12910007970A /* CallVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B877E24126CA12910007970A /* CallVC.swift */; };
+		B877E24626CA13BA0007970A /* CallVC+Camera.swift in Sources */ = {isa = PBXBuildFile; fileRef = B877E24526CA13BA0007970A /* CallVC+Camera.swift */; };
 		B8783E9E23EB948D00404FB8 /* UILabel+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8783E9D23EB948D00404FB8 /* UILabel+Interaction.swift */; };
 		B879D449247E1BE300DB3608 /* PathVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B879D448247E1BE300DB3608 /* PathVC.swift */; };
 		B87EF17126367CF800124B3C /* FileServerAPIV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B87EF17026367CF800124B3C /* FileServerAPIV2.swift */; };
@@ -1194,8 +1194,8 @@
 		B86BD08523399CEF000F5AE3 /* SeedModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedModal.swift; sourceTree = "<group>"; };
 		B87588582644CA9D000E60D0 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B8758859264503A6000E60D0 /* JoinOpenGroupModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinOpenGroupModal.swift; sourceTree = "<group>"; };
-		B877E24126CA12910007970A /* CallVCV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallVCV2.swift; sourceTree = "<group>"; };
-		B877E24526CA13BA0007970A /* CallVCV2+Camera.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CallVCV2+Camera.swift"; sourceTree = "<group>"; };
+		B877E24126CA12910007970A /* CallVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallVC.swift; sourceTree = "<group>"; };
+		B877E24526CA13BA0007970A /* CallVC+Camera.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CallVC+Camera.swift"; sourceTree = "<group>"; };
 		B8783E9D23EB948D00404FB8 /* UILabel+Interaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Interaction.swift"; sourceTree = "<group>"; };
 		B879D448247E1BE300DB3608 /* PathVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathVC.swift; sourceTree = "<group>"; };
 		B879D44A247E1D9200DB3608 /* PathStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathStatusView.swift; sourceTree = "<group>"; };
@@ -2321,8 +2321,8 @@
 		B8B558ED26C4B55F00693325 /* Calls */ = {
 			isa = PBXGroup;
 			children = (
-				B877E24126CA12910007970A /* CallVCV2.swift */,
-				B877E24526CA13BA0007970A /* CallVCV2+Camera.swift */,
+				B877E24126CA12910007970A /* CallVC.swift */,
+				B877E24526CA13BA0007970A /* CallVC+Camera.swift */,
 				B8B558F026C4BB0600693325 /* CameraManager.swift */,
 			);
 			path = Calls;
@@ -4822,7 +4822,7 @@
 				B8783E9E23EB948D00404FB8 /* UILabel+Interaction.swift in Sources */,
 				B893063F2383961A005EAA8E /* ScanQRCodeWrapperVC.swift in Sources */,
 				B879D449247E1BE300DB3608 /* PathVC.swift in Sources */,
-				B877E24626CA13BA0007970A /* CallVCV2+Camera.swift in Sources */,
+				B877E24626CA13BA0007970A /* CallVC+Camera.swift in Sources */,
 				454A84042059C787008B8C75 /* MediaTileViewController.swift in Sources */,
 				340FC8B4204DAC8D007AEB0F /* OWSBackupSettingsViewController.m in Sources */,
 				34D1F0871F8678AA0066283D /* ConversationViewItem.m in Sources */,
@@ -4884,7 +4884,7 @@
 				B835246E25C38ABF0089A44F /* ConversationVC.swift in Sources */,
 				B8AF4BB426A5204600583500 /* SendSeedModal.swift in Sources */,
 				B821494625D4D6FF009C0F2A /* URLModal.swift in Sources */,
-				B877E24226CA12910007970A /* CallVCV2.swift in Sources */,
+				B877E24226CA12910007970A /* CallVC.swift in Sources */,
 				C374EEEB25DA3CA70073A857 /* ConversationTitleView.swift in Sources */,
 				B88FA7F2260C3EB10049422F /* OpenGroupSuggestionGrid.swift in Sources */,
 				4CA485BB2232339F004B9E7D /* PhotoCaptureViewController.swift in Sources */,
diff --git a/Session/Calls/CallVCV2+Camera.swift b/Session/Calls/CallVC+Camera.swift
similarity index 93%
rename from Session/Calls/CallVCV2+Camera.swift
rename to Session/Calls/CallVC+Camera.swift
index 89bf426fe..3370a1bff 100644
--- a/Session/Calls/CallVCV2+Camera.swift
+++ b/Session/Calls/CallVC+Camera.swift
@@ -1,6 +1,6 @@
 import WebRTC
 
-extension CallVCV2 : CameraManagerDelegate {
+extension CallVC : CameraManagerDelegate {
     
     func handleVideoOutputCaptured(sampleBuffer: CMSampleBuffer) {
         guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
diff --git a/Session/Calls/CallVCV2.swift b/Session/Calls/CallVC.swift
similarity index 97%
rename from Session/Calls/CallVCV2.swift
rename to Session/Calls/CallVC.swift
index 40b07ef80..47ee0adeb 100644
--- a/Session/Calls/CallVCV2.swift
+++ b/Session/Calls/CallVC.swift
@@ -3,7 +3,7 @@ import SessionUIKit
 import SessionMessagingKit
 import SessionUtilitiesKit
 
-final class CallVCV2 : UIViewController, WebRTCWrapperDelegate {
+final class CallVC : UIViewController, WebRTCWrapperDelegate {
     let sessionID: String
     let mode: Mode
     let webRTCWrapper: WebRTCWrapper
diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 0de4bcdfb..ad49ad20c 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -28,7 +28,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
     
     @objc func startCall() {
         guard let contactSessionID = (thread as? TSContactThread)?.contactSessionID() else { return }
-        let callVC = CallVCV2(for: contactSessionID, mode: .offer)
+        let callVC = CallVC(for: contactSessionID, mode: .offer)
         navigationController!.pushViewController(callVC, animated: true, completion: nil)
     }
 
diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift
index 6186fd4cd..bd98133dc 100644
--- a/Session/Meta/AppDelegate.swift
+++ b/Session/Meta/AppDelegate.swift
@@ -11,7 +11,7 @@ extension AppDelegate {
                 guard let presentingVC = CurrentAppContext().frontmostViewController() else { preconditionFailure() } // TODO: Handle more gracefully
                 let alert = UIAlertController(title: "Incoming Call", message: nil, preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "Accept", style: .default, handler: { _ in
-                    let callVC = CallVCV2(for: message.sender!, mode: .answer(sdp: sdp))
+                    let callVC = CallVC(for: message.sender!, mode: .answer(sdp: sdp))
                     presentingVC.dismiss(animated: true) {
                         presentingVC.present(callVC, animated: true, completion: nil)
                     }