diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 9350ff7b3f102f3f8a7cf089313382e973b41187..d317789f84d750057cdab5436f3ddce2b5c5fe16 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -10,7 +10,7 @@ import ToastContainer from '../toast/container';
 import ModalContainer from '../modal/container';
 import NotificationsBarContainer from '../notifications-bar/container';
 import AudioContainer from '../audio/container';
-import ChatNotificationContainer from '../chat/notification/container';
+import ChatAlertContainer from '../chat/alert/container';
 import { styles } from './styles';
 
 const MOBILE_MEDIA = 'only screen and (max-width: 40em)';
@@ -319,7 +319,7 @@ class App extends Component {
         <ModalContainer />
         <AudioContainer />
         <ToastContainer />
-        <ChatNotificationContainer currentChatID={params.chatID} />
+        <ChatAlertContainer currentChatID={params.chatID} />
       </main>
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/chat/notification/audio-notification/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
similarity index 100%
rename from bigbluebutton-html5/imports/ui/components/chat/notification/audio-notification/component.jsx
rename to bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
diff --git a/bigbluebutton-html5/imports/ui/components/chat/notification/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
similarity index 94%
rename from bigbluebutton-html5/imports/ui/components/chat/notification/component.jsx
rename to bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
index b8a79a5052b3c731fa792dabb95fba73f60241fa..50aa6c5f673a9a0ac2e40269c5ff6cf940b85d72 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/notification/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 import _ from 'lodash';
 import UnreadMessages from '/imports/ui/services/unread-messages';
-import ChatAudioNotification from './audio-notification/component';
-import ChatPushNotification from './push-notification/component';
+import ChatAudioAlert from './audio-alert/component';
+import ChatPushAlert from './push-alert/component';
 import Service from '../service';
 import { styles } from '../styles';
 
@@ -36,7 +36,7 @@ const intlMessages = defineMessages({
 const PUBLIC_KEY = 'public';
 const PRIVATE_KEY = 'private';
 
-class ChatNotification extends Component {
+class ChatAlert extends Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -157,7 +157,7 @@ class ChatNotification extends Component {
             .map(msg => this.createMessage(name, msg.content)));
           const limitingMessages = flatMessages;
 
-          return (<ChatPushNotification
+          return (<ChatPushAlert
             key={id}
             chatId={id}
             content={limitingMessages}
@@ -210,7 +210,7 @@ class ChatNotification extends Component {
       <span>
         {
         chatsNotify.map(({ sender, time, content }) =>
-            (<ChatPushNotification
+            (<ChatPushAlert
               key={time}
               chatId={PUBLIC_KEY}
               name={sender.name}
@@ -249,13 +249,13 @@ class ChatNotification extends Component {
 
     return (
       <span>
-        <ChatAudioNotification play={shouldPlayAudio} count={unreadMessagesCount} />
+        <ChatAudioAlert play={shouldPlayAudio} count={unreadMessagesCount} />
         { this.notifyPublicChat() }
         { this.notifyPrivateChat() }
       </span>
     );
   }
 }
-ChatNotification.propTypes = propTypes;
+ChatAlert.propTypes = propTypes;
 
-export default injectIntl(ChatNotification);
+export default injectIntl(ChatAlert);
diff --git a/bigbluebutton-html5/imports/ui/components/chat/notification/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
similarity index 78%
rename from bigbluebutton-html5/imports/ui/components/chat/notification/container.jsx
rename to bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
index 08e93234c9c3d6a2ffa110d186ca8026bddfab0e..574bcd9ec7511d52d809d8f25d2cbdb2b0d2bb62 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/notification/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
@@ -2,10 +2,10 @@ import React from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
 import UserListService from '/imports/ui/components/user-list/service';
 import Settings from '/imports/ui/services/settings';
-import ChatNotification from './component';
+import ChatAlert from './component';
 
-const ChatNotificationContainer = props => (
-  <ChatNotification {...props} />
+const ChatAlertContainer = props => (
+  <ChatAlert {...props} />
 );
 
 export default withTracker(() => {
@@ -18,4 +18,4 @@ export default withTracker(() => {
     openChats,
     publicUserId: Meteor.settings.public.chat.public_userid,
   };
-})(ChatNotificationContainer);
+})(ChatAlertContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/chat/notification/push-notification/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
similarity index 100%
rename from bigbluebutton-html5/imports/ui/components/chat/notification/push-notification/component.jsx
rename to bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 38f308196217e82dbcdf6e433f04659feb83a4d5..457546e4a63725d0f86b20977b9329aa6719ae33 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -126,8 +126,8 @@
     "app.actionsBar.raiseLabel": "Raise",
     "app.actionsBar.label": "Actions Bar",
     "app.submenu.application.applicationSectionTitle": "Application",
-    "app.submenu.application.audioNotifyLabel": "Audio notifications for chat",
-    "app.submenu.application.pushNotifyLabel": "Push notifications for chat",
+    "app.submenu.application.audioNotifyLabel": "Audio Alerts for Chat",
+    "app.submenu.application.pushNotifyLabel": "Popup Alerts for Chat",
     "app.submenu.application.fontSizeControlLabel": "Font size",
     "app.submenu.application.increaseFontBtnLabel": "Increase Application Font Size",
     "app.submenu.application.decreaseFontBtnLabel": "Decrease Application Font Size",