diff --git a/res/css/_components.scss b/res/css/_components.scss
index 12a65bbbde..f175981e9f 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -69,7 +69,7 @@
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
-@import "./views/dialogs/_EMSElementProDialog.scss";
+@import "./views/dialogs/_ElementProDialog.scss";
 @import "./views/dialogs/_FeedbackDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
diff --git a/res/css/views/dialogs/_EMSElementProDialog.scss b/res/css/views/dialogs/_ElementProDialog.scss
similarity index 88%
rename from res/css/views/dialogs/_EMSElementProDialog.scss
rename to res/css/views/dialogs/_ElementProDialog.scss
index 7ee05e5fbd..137454a8e5 100644
--- a/res/css/views/dialogs/_EMSElementProDialog.scss
+++ b/res/css/views/dialogs/_ElementProDialog.scss
@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_EMSElementProDialog .mx_Dialog {
+.mx_ElementProDialog .mx_Dialog {
     height: 66%;
     min-width: 50%;
 }
 
-.mx_EMSElementProBaseDialog {
+.mx_ElementProBaseDialog {
     height: 100%;
 }
 
-.mx_EMSElementProDialog_container {
+.mx_ElementProDialog_container {
     height: 90%;
 
     iframe {
diff --git a/src/components/structures/EMSElementProAction.tsx b/src/components/structures/ElementProAction.tsx
similarity index 85%
rename from src/components/structures/EMSElementProAction.tsx
rename to src/components/structures/ElementProAction.tsx
index 9426f12234..fdd7df8410 100644
--- a/src/components/structures/EMSElementProAction.tsx
+++ b/src/components/structures/ElementProAction.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
-import EMSElementProDialog from "../views/dialogs/EMSElementProDialog";
+import ElementProDialog from "../views/dialogs/ElementProDialog";
 import Modal, {IHandle} from "../../Modal";
 import {
     IconizedContextMenuOption,
@@ -27,15 +27,15 @@ interface IProps {}
 
 interface IState {}
 
-export default class EMSElementProAction extends React.PureComponent<IProps, IState> {
+export default class ElementProAction extends React.PureComponent<IProps, IState> {
     private closingAllowed = false;
     private modalRef: IHandle<void[]>;
 
     private openDialog = () => {
         this.modalRef = Modal.createTrackedDialog(
-            'Element Pro Open', '', EMSElementProDialog, {
+            'Element Pro Open', '', ElementProDialog, {
                 requestClose: this.requestClose,
-            }, "mx_EMSElementProDialog", false, true, {
+            }, "mx_ElementProDialog", false, true, {
                 onBeforeClose: async () => this.closingAllowed,
             },
         );
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index aa8c6c91a2..f8dd4e0b91 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -51,7 +51,7 @@ import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import EditCommunityPrototypeDialog from "../views/dialogs/EditCommunityPrototypeDialog";
 import {UIFeature} from "../../settings/UIFeature";
-import EMSElementProAction from "./EMSElementProAction";
+import ElementProAction from "./ElementProAction";
 
 interface IProps {
     isMinimized: boolean;
@@ -274,7 +274,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
         let topSection;
         const signupLink = getHostingLink("user-context-menu");
-        const elementProConfig = SdkConfig.get().ems_element_pro;
+        const elementProConfig = SdkConfig.get().element_pro;
         if (MatrixClientPeg.get().isGuest()) {
             topSection = (
                 <div className="mx_UserMenu_contextMenu_header mx_UserMenu_contextMenu_guestPrompts">
@@ -297,7 +297,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         } else if (signupLink || elementProConfig) {
             let elementProIFrame;
             if (elementProConfig && elementProConfig.url) {
-                // If ems_element_pro.domains is set to a non-empty array, only show
+                // If element_pro.domains is set to a non-empty array, only show
                 // dialog if the user is on the domain or a subdomain.
                 const elementProDomains = elementProConfig.domains || [];
                 const mxDomain = MatrixClientPeg.get().getDomain();
@@ -307,7 +307,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                         className=""
                         onClick={this.onCloseMenu}
                     >
-                        <EMSElementProAction />
+                        <ElementProAction />
                     </div>;
                 }
             }
diff --git a/src/components/views/dialogs/EMSElementProConfirmCloseDialog.tsx b/src/components/views/dialogs/ElementProConfirmCloseDialog.tsx
similarity index 93%
rename from src/components/views/dialogs/EMSElementProConfirmCloseDialog.tsx
rename to src/components/views/dialogs/ElementProConfirmCloseDialog.tsx
index 95210a49a5..d8586aa386 100644
--- a/src/components/views/dialogs/EMSElementProConfirmCloseDialog.tsx
+++ b/src/components/views/dialogs/ElementProConfirmCloseDialog.tsx
@@ -28,7 +28,7 @@ interface IState {}
 /*
  * A dialog for confirming closing the Element Pro setup dialog.
  */
-export default class EMSElementProConfirmCloseDialog extends React.PureComponent<IProps, IState> {
+export default class ElementProConfirmCloseDialog extends React.PureComponent<IProps, IState> {
     public render() {
         return (
             <QuestionDialog
diff --git a/src/components/views/dialogs/EMSElementProDataConfirmDialog.tsx b/src/components/views/dialogs/ElementProDataConfirmDialog.tsx
similarity index 93%
rename from src/components/views/dialogs/EMSElementProDataConfirmDialog.tsx
rename to src/components/views/dialogs/ElementProDataConfirmDialog.tsx
index 71e4f7f5d5..c107620f5b 100644
--- a/src/components/views/dialogs/EMSElementProDataConfirmDialog.tsx
+++ b/src/components/views/dialogs/ElementProDataConfirmDialog.tsx
@@ -28,7 +28,7 @@ interface IState {}
 /*
  * A dialog for confirming transfer of data to the Element Pro iframe.
  */
-export default class EMSElementProDataConfirmDialog extends React.PureComponent<IProps, IState> {
+export default class ElementProDataConfirmDialog extends React.PureComponent<IProps, IState> {
     public render() {
         return (
             <QuestionDialog
diff --git a/src/components/views/dialogs/EMSElementProDialog.tsx b/src/components/views/dialogs/ElementProDialog.tsx
similarity index 89%
rename from src/components/views/dialogs/EMSElementProDialog.tsx
rename to src/components/views/dialogs/ElementProDialog.tsx
index 20f04af6f6..bdcfb6e783 100644
--- a/src/components/views/dialogs/EMSElementProDialog.tsx
+++ b/src/components/views/dialogs/ElementProDialog.tsx
@@ -16,14 +16,14 @@ limitations under the License.
 
 import * as React from "react";
 import BaseDialog from '../../views/dialogs/BaseDialog';
-import EMSElementProConfirmCloseDialog from './EMSElementProConfirmCloseDialog';
-import EMSElementProDataConfirmDialog from './EMSElementProDataConfirmDialog';
+import ElementProConfirmCloseDialog from './ElementProConfirmCloseDialog';
+import ElementProDataConfirmDialog from './ElementProDataConfirmDialog';
 import Modal from "../../../Modal";
 import SdkConfig from "../../../SdkConfig";
 import {_t} from "../../../languageHandler";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {OwnProfileStore} from "../../../stores/OwnProfileStore";
-import {IPostmessage, IPostmessageResponseData, PostmessageAction} from "./EMSElementProDialogTypes";
+import {IPostmessage, IPostmessageResponseData, PostmessageAction} from "./ElementProDialogTypes";
 
 interface IProps {
     requestClose(): void;
@@ -34,7 +34,7 @@ interface IState {
     error: string;
 }
 
-export default class EMSElementProDialog extends React.PureComponent<IProps, IState> {
+export default class ElementProDialog extends React.PureComponent<IProps, IState> {
     private iframeRef: React.RefObject<HTMLIFrameElement> = React.createRef();
     private readonly elementProSetupUrl: string;
 
@@ -46,7 +46,7 @@ export default class EMSElementProDialog extends React.PureComponent<IProps, ISt
             error: null,
         };
 
-        this.elementProSetupUrl = SdkConfig.get().ems_element_pro.url;
+        this.elementProSetupUrl = SdkConfig.get().element_pro.url;
     }
 
     private messageHandler = (message: IPostmessage) => {
@@ -56,7 +56,7 @@ export default class EMSElementProDialog extends React.PureComponent<IProps, ISt
         switch (message.data.action) {
             case PostmessageAction.ElementProAccountDetailsRequest:
                 Modal.createDialog(
-                    EMSElementProDataConfirmDialog,
+                    ElementProDataConfirmDialog,
                     {
                         onFinished: result => {
                             if (result) {
@@ -85,7 +85,7 @@ export default class EMSElementProDialog extends React.PureComponent<IProps, ISt
             this.props.requestClose();
         } else {
             Modal.createDialog(
-                EMSElementProConfirmCloseDialog,
+                ElementProConfirmCloseDialog,
                 {
                     onFinished: result => {
                         if (result) {
@@ -133,13 +133,13 @@ export default class EMSElementProDialog extends React.PureComponent<IProps, ISt
     public render(): React.ReactNode {
         return (
             <BaseDialog
-                className="mx_EMSElementProBaseDialog"
+                className="mx_ElementProBaseDialog"
                 onFinished={this.onFinished}
                 title={_t("Set up your own personal Element host")}
                 hasCancel={true}
                 fixedWidth={false}
             >
-                <div className="mx_EMSElementProDialog_container">
+                <div className="mx_ElementProDialog_container">
                     <iframe
                         src={this.elementProSetupUrl}
                         ref={this.iframeRef}
diff --git a/src/components/views/dialogs/EMSElementProDialogTypes.tsx b/src/components/views/dialogs/ElementProDialogTypes.tsx
similarity index 100%
rename from src/components/views/dialogs/EMSElementProDialogTypes.tsx
rename to src/components/views/dialogs/ElementProDialogTypes.tsx