CallView2 -> CallView

res/css/_components.scss

@@ -217,5 +217,5 @@
 @import "./views/terms/_InlineTermsAgreement.scss";
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/_CallContainer.scss";
-@import "./views/voip/_CallView2.scss";
+@import "./views/voip/_CallView.scss";
 @import "./views/voip/_VideoView.scss";

res/css/views/voip/_CallView.scss

@@ -15,9 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14231
+.mx_CallView_voice {
-
-.mx_CallView2_voice {
     background-color: $accent-color;
     color: $accent-fg-color;
     cursor: pointer;
@@ -60,7 +58,7 @@ limitations under the License.
     }
 }
 
-.mx_CallView2_hangup {
+.mx_CallView_hangup {
     position: absolute;
 
     right: 8px;

src/components/views/rooms/AuxPanel.js

@@ -28,6 +28,7 @@ import classNames from 'classnames';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import CallView from "../voip/CallView";
 
 
 export default createReactClass({
@@ -142,7 +143,6 @@ export default createReactClass({
     },
 
     render: function() {
-        const CallView = sdk.getComponent("voip.CallView");
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         let fileDropTarget = null;

src/components/views/voip/CallPreview2.tsx

@@ -19,7 +19,7 @@ limitations under the License.
 
 import React from 'react';
 
-import CallView from "./CallView2";
+import CallView from "./CallView";
 import RoomViewStore from '../../../stores/RoomViewStore';
 import CallHandler from '../../../CallHandler';
 import dis from '../../../dispatcher/dispatcher';

src/components/views/voip/CallView.tsx

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14231
-
 import React, {createRef} from 'react';
 import Room from 'matrix-js-sdk/src/models/room';
 import dis from '../../../dispatcher/dispatcher';
@@ -156,7 +154,7 @@ export default class CallView extends React.Component<IProps, IState> {
             const client = MatrixClientPeg.get();
             const callRoom = client.getRoom(this.state.call.roomId);
 
-            view = <AccessibleButton className="mx_CallView2_voice" onClick={this.props.onClick}>
+            view = <AccessibleButton className="mx_CallView_voice" onClick={this.props.onClick}>
                 <PulsedAvatar>
                     <RoomAvatar
                         room={callRoom}
@@ -181,7 +179,7 @@ export default class CallView extends React.Component<IProps, IState> {
         let hangup: React.ReactNode;
         if (this.props.showHangup) {
             hangup = <div
-                className="mx_CallView2_hangup"
+                className="mx_CallView_hangup"
                 onClick={() => {
                     dis.dispatch({
                         action: 'hangup',