From b4681e9b93179296f4c4dc5a74f69e949a3e34ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Mon, 19 Feb 2018 15:09:23 +0100
Subject: [PATCH] Rename permissions gates to change perm with permissions
 (#833)

---
 .../system_users/system_users_dropdown.jsx    |   2 +-
 components/announcement_bar/index.js          |   4 +-
 .../components/backstage_sidebar.jsx          |  10 +-
 components/channel_header/channel_header.jsx  |  22 +-
 components/channel_members_dropdown/index.js  |   6 +-
 .../integrations/abstract_oauth_app.jsx       |   2 +-
 .../integrations/installed_commands/index.js  |   4 +-
 .../installed_incoming_webhooks/index.js      |   4 +-
 .../installed_oauth_apps/index.js             |   4 +-
 .../installed_outgoing_webhooks/index.js      |   4 +-
 components/integrations/integrations.jsx      |  16 +-
 components/member_list_team/index.js          |   4 +-
 components/more_channels/more_channels.jsx    |   4 +-
 components/navbar/navbar.jsx                  |  12 +-
 .../new_channel_modal/new_channel_modal.jsx   |   4 +-
 .../channel_permission_gate.jsx               |  10 +-
 .../channel_permission_gate/index.js          |  12 +-
 .../system_permission_gate/index.js           |  10 +-
 .../system_permission_gate.jsx                |  10 +-
 .../team_permission_gate/index.js             |  12 +-
 .../team_permission_gate.jsx                  |  10 +-
 components/post_view/post_info/post_info.jsx  |   2 +-
 components/post_view/reaction/index.js        |   6 +-
 .../post_view/reaction_list/reaction_list.jsx |   2 +-
 components/rhs_comment/rhs_comment.jsx        |   2 +-
 components/select_team/select_team.jsx        |   8 +-
 .../dropdown/sidebar_header_dropdown.jsx      |  20 +-
 components/sidebar/sidebar.jsx                |   4 +-
 .../sidebar_right_menu/sidebar_right_menu.jsx |  14 +-
 .../team_sidebar/team_sidebar_controller.jsx  |   2 +-
 package.json                                  |   2 +-
 .../new_channel_modal.test.jsx.snap           |  10 +-
 .../permissions_gates.test.jsx.snap           | 236 +++++++++---------
 .../abstract_oauth_app.test.jsx.snap          |   4 +-
 .../navbar/__snapshots__/navbar.test.jsx.snap |  48 ++--
 tests/components/permissions_gates.test.jsx   |  86 +++----
 .../__snapshots__/sidebar.test.jsx.snap       |  36 +--
 utils/channel_intro_messages.jsx              |  10 +-
 utils/channel_utils.jsx                       |  10 +-
 utils/post_utils.jsx                          |  10 +-
 yarn.lock                                     |   2 +-
 41 files changed, 340 insertions(+), 340 deletions(-)

diff --git a/components/admin_console/system_users/system_users_dropdown.jsx b/components/admin_console/system_users/system_users_dropdown.jsx
index bea38597c7b3..1776ec57570f 100644
--- a/components/admin_console/system_users/system_users_dropdown.jsx
+++ b/components/admin_console/system_users/system_users_dropdown.jsx
@@ -491,7 +491,7 @@ export default class SystemUsersDropdown extends React.Component {
         let revokeSessions;
         if (showRevokeSessions) {
             revokeSessions = (
-                <SystemPermissionGate perms={[Permissions.REVOKE_USER_ACCESS_TOKEN]}>
+                <SystemPermissionGate permissions={[Permissions.REVOKE_USER_ACCESS_TOKEN]}>
                     <li role='presentation'>
                         <a
                             id='revokeSessions'
diff --git a/components/announcement_bar/index.js b/components/announcement_bar/index.js
index 58e06868e288..645ad590bc1b 100644
--- a/components/announcement_bar/index.js
+++ b/components/announcement_bar/index.js
@@ -3,14 +3,14 @@
 
 import {connect} from 'react-redux';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
-import {haveISystemPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles';
 import {Permissions} from 'mattermost-redux/constants';
 import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
 
 import AnnouncementBar from './announcement_bar.jsx';
 
 function mapStateToProps(state) {
-    const canViewSystemErrors = haveISystemPerm(state, {perm: Permissions.MANAGE_SYSTEM});
+    const canViewSystemErrors = haveISystemPermission(state, {permission: Permissions.MANAGE_SYSTEM});
     const license = getLicense(state);
     const config = getConfig(state);
 
diff --git a/components/backstage/components/backstage_sidebar.jsx b/components/backstage/components/backstage_sidebar.jsx
index 1f9d0eed92cc..fe7610a665a4 100644
--- a/components/backstage/components/backstage_sidebar.jsx
+++ b/components/backstage/components/backstage_sidebar.jsx
@@ -61,7 +61,7 @@ export default class BackstageSidebar extends React.Component {
         if (this.props.enableIncomingWebhooks) {
             incomingWebhooks = (
                 <TeamPermissionGate
-                    perms={[Permissions.MANAGE_WEBHOOKS]}
+                    permissions={[Permissions.MANAGE_WEBHOOKS]}
                     teamId={this.props.team.id}
                 >
                     <BackstageSection
@@ -82,7 +82,7 @@ export default class BackstageSidebar extends React.Component {
         if (this.props.enableOutgoingWebhooks) {
             outgoingWebhooks = (
                 <TeamPermissionGate
-                    perms={[Permissions.MANAGE_WEBHOOKS]}
+                    permissions={[Permissions.MANAGE_WEBHOOKS]}
                     teamId={this.props.team.id}
                 >
                     <BackstageSection
@@ -103,7 +103,7 @@ export default class BackstageSidebar extends React.Component {
         if (this.props.enableCommands) {
             commands = (
                 <TeamPermissionGate
-                    perms={[Permissions.MANAGE_SLASH_COMMANDS]}
+                    permissions={[Permissions.MANAGE_SLASH_COMMANDS]}
                     teamId={this.props.team.id}
                 >
                     <BackstageSection
@@ -123,7 +123,7 @@ export default class BackstageSidebar extends React.Component {
         let oauthApps = null;
         if (this.props.enableOAuthServiceProvider) {
             oauthApps = (
-                <SystemPermissionGate perms={[Permissions.MANAGE_OAUTH]}>
+                <SystemPermissionGate permissions={[Permissions.MANAGE_OAUTH]}>
                     <BackstageSection
                         name='oauth2-apps'
                         parentLink={'/' + this.props.team.name + '/integrations'}
@@ -140,7 +140,7 @@ export default class BackstageSidebar extends React.Component {
 
         return (
             <TeamPermissionGate
-                perms={[Permissions.MANAGE_WEBHOOKS, Permissions.MANAGE_SLASH_COMMANDS, Permissions.MANAGE_OAUTH]}
+                permissions={[Permissions.MANAGE_WEBHOOKS, Permissions.MANAGE_SLASH_COMMANDS, Permissions.MANAGE_OAUTH]}
                 teamId={this.props.team.id}
             >
                 <BackstageCategory
diff --git a/components/channel_header/channel_header.jsx b/components/channel_header/channel_header.jsx
index a17be77a6ec4..1217d9152023 100644
--- a/components/channel_header/channel_header.jsx
+++ b/components/channel_header/channel_header.jsx
@@ -581,8 +581,8 @@ export default class ChannelHeader extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
-                        key='add_members_perm'
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
+                        key='add_members_permission'
                     >
                         <li
                             key='add_members'
@@ -608,8 +608,8 @@ export default class ChannelHeader extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
-                        key='manage_members_perm'
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
+                        key='manage_members_permission'
                     >
                         <li
                             key='manage_members'
@@ -634,9 +634,9 @@ export default class ChannelHeader extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
                         invert={true}
-                        key='view_members_perm'
+                        key='view_members_permission'
                     >
                         <li
                             key='view_members'
@@ -662,8 +662,8 @@ export default class ChannelHeader extends React.Component {
                 <ChannelPermissionGate
                     channelId={channel.id}
                     teamId={teamId}
-                    perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
-                    key='set_channel_info_perm'
+                    permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+                    key='set_channel_info_permission'
                 >
                     <li
                         key='divider-2'
@@ -728,8 +728,8 @@ export default class ChannelHeader extends React.Component {
                 <ChannelPermissionGate
                     channelId={channel.id}
                     teamId={teamId}
-                    perms={[isPrivate ? Permissions.DELETE_PRIVATE_CHANNEL : Permissions.DELETE_PUBLIC_CHANNEL]}
-                    key='delete_channel_perm'
+                    permissions={[isPrivate ? Permissions.DELETE_PRIVATE_CHANNEL : Permissions.DELETE_PUBLIC_CHANNEL]}
+                    key='delete_channel_permission'
                 >
                     <li
                         key='delete_channel'
@@ -861,7 +861,7 @@ export default class ChannelHeader extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
                     >
                         <button
                             className='style--none'
diff --git a/components/channel_members_dropdown/index.js b/components/channel_members_dropdown/index.js
index b58607cb6718..85865baa6e37 100644
--- a/components/channel_members_dropdown/index.js
+++ b/components/channel_members_dropdown/index.js
@@ -4,7 +4,7 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {getChannelStats} from 'mattermost-redux/actions/channels';
-import {haveIChannelPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
 import {getLicense} from 'mattermost-redux/selectors/entities/general';
 
 import {canManageMembers} from 'utils/channel_utils.jsx';
@@ -12,12 +12,12 @@ import {canManageMembers} from 'utils/channel_utils.jsx';
 import ChannelMembersDropdown from './channel_members_dropdown.jsx';
 
 function mapStateToProps(state, ownProps) {
-    const canChangeMemberRoles = haveIChannelPerm(
+    const canChangeMemberRoles = haveIChannelPermission(
         state,
         {
             channel: ownProps.channel.id,
             team: ownProps.channel.team_id,
-            perm: Permissions.MANAGE_CHANNEL_ROLES
+            permission: Permissions.MANAGE_CHANNEL_ROLES
         }
     );
     const license = getLicense(state);
diff --git a/components/integrations/abstract_oauth_app.jsx b/components/integrations/abstract_oauth_app.jsx
index 2a3ac2423666..f36664c45117 100644
--- a/components/integrations/abstract_oauth_app.jsx
+++ b/components/integrations/abstract_oauth_app.jsx
@@ -222,7 +222,7 @@ export default class AbstractOAuthApp extends React.PureComponent {
         }
 
         const trusted = (
-            <SystemPermissionGate perms={[Permissions.MANAGE_OAUTH]}>
+            <SystemPermissionGate permissions={[Permissions.MANAGE_OAUTH]}>
                 <div className='form-group'>
                     <label
                         className='control-label col-sm-4'
diff --git a/components/integrations/installed_commands/index.js b/components/integrations/installed_commands/index.js
index 3e1be0a2bc3b..cb66921c0fd2 100644
--- a/components/integrations/installed_commands/index.js
+++ b/components/integrations/installed_commands/index.js
@@ -4,13 +4,13 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {deleteCommand, regenCommandToken} from 'mattermost-redux/actions/integrations';
-import {haveITeamPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 import {Permissions} from 'mattermost-redux/constants';
 
 import InstalledCommands from './installed_commands.jsx';
 
 function mapStateToProps(state, ownProps) {
-    const canManageOthersSlashCommands = haveITeamPerm(state, {team: ownProps.team.id, perm: Permissions.MANAGE_OTHERS_SLASH_COMMANDS});
+    const canManageOthersSlashCommands = haveITeamPermission(state, {team: ownProps.team.id, permission: Permissions.MANAGE_OTHERS_SLASH_COMMANDS});
 
     return {
         canManageOthersSlashCommands
diff --git a/components/integrations/installed_incoming_webhooks/index.js b/components/integrations/installed_incoming_webhooks/index.js
index 714900231ed3..c31162ed1b19 100644
--- a/components/integrations/installed_incoming_webhooks/index.js
+++ b/components/integrations/installed_incoming_webhooks/index.js
@@ -8,7 +8,7 @@ import {getAllChannels} from 'mattermost-redux/selectors/entities/channels';
 import {getIncomingHooks} from 'mattermost-redux/selectors/entities/integrations';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getUsers} from 'mattermost-redux/selectors/entities/users';
-import {haveITeamPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 import {Permissions} from 'mattermost-redux/constants';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
@@ -17,7 +17,7 @@ import InstalledIncomingWebhooks from './installed_incoming_webhooks.jsx';
 function mapStateToProps(state) {
     const config = getConfig(state);
     const teamId = getCurrentTeamId(state);
-    const canManageOthersWebhooks = haveITeamPerm(state, {team: teamId, perm: Permissions.MANAGE_OTHERS_WEBHOOKS});
+    const canManageOthersWebhooks = haveITeamPermission(state, {team: teamId, permission: Permissions.MANAGE_OTHERS_WEBHOOKS});
     const incomingHooks = getIncomingHooks(state);
     const incomingWebhooks = Object.keys(incomingHooks).
         map((key) => incomingHooks[key]).
diff --git a/components/integrations/installed_oauth_apps/index.js b/components/integrations/installed_oauth_apps/index.js
index d43cacdaba9e..296c1326db98 100644
--- a/components/integrations/installed_oauth_apps/index.js
+++ b/components/integrations/installed_oauth_apps/index.js
@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import * as Actions from 'mattermost-redux/actions/integrations';
 import {getOAuthApps} from 'mattermost-redux/selectors/entities/integrations';
-import {haveISystemPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles';
 import {Permissions} from 'mattermost-redux/constants';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
@@ -17,7 +17,7 @@ function mapStateToProps(state) {
     const enableOnlyAdminIntegrations = config.EnableOnlyAdminIntegrations === 'true';
 
     return {
-        canManageOauth: haveISystemPerm(state, {perm: Permissions.MANAGE_OAUTH}),
+        canManageOauth: haveISystemPermission(state, {permission: Permissions.MANAGE_OAUTH}),
         oauthApps: getOAuthApps(state),
         regenOAuthAppSecretRequest: state.requests.integrations.updateOAuthApp,
         enableOAuthServiceProvider,
diff --git a/components/integrations/installed_outgoing_webhooks/index.js b/components/integrations/installed_outgoing_webhooks/index.js
index f3df55e5d647..2b6802cea4f2 100644
--- a/components/integrations/installed_outgoing_webhooks/index.js
+++ b/components/integrations/installed_outgoing_webhooks/index.js
@@ -5,7 +5,7 @@ import {getOutgoingHooks} from 'mattermost-redux/selectors/entities/integrations
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getAllChannels} from 'mattermost-redux/selectors/entities/channels';
 import {getUsers} from 'mattermost-redux/selectors/entities/users';
-import {haveITeamPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 import {Permissions} from 'mattermost-redux/constants';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
@@ -14,7 +14,7 @@ import InstalledOutgoingWebhook from './installed_outgoing_webhooks.jsx';
 function mapStateToProps(state) {
     const config = getConfig(state);
     const teamId = getCurrentTeamId(state);
-    const canManageOthersWebhooks = haveITeamPerm(state, {team: teamId, perm: Permissions.MANAGE_OTHERS_WEBHOOKS});
+    const canManageOthersWebhooks = haveITeamPermission(state, {team: teamId, permission: Permissions.MANAGE_OTHERS_WEBHOOKS});
     const outgoingHooks = getOutgoingHooks(state);
     const outgoingWebhooks = Object.keys(outgoingHooks).
         map((key) => outgoingHooks[key]).
diff --git a/components/integrations/integrations.jsx b/components/integrations/integrations.jsx
index 668a2de629fc..5e855a1105ea 100644
--- a/components/integrations/integrations.jsx
+++ b/components/integrations/integrations.jsx
@@ -48,8 +48,8 @@ export default class Integrations extends React.Component {
             options.push(
                 <TeamPermissionGate
                     teamId={this.props.team.id}
-                    perms={[Permissions.MANAGE_WEBHOOKS]}
-                    key='incomingWebhookPerm'
+                    permissions={[Permissions.MANAGE_WEBHOOKS]}
+                    key='incomingWebhookPermission'
                 >
                     <IntegrationOption
                         key='incomingWebhook'
@@ -76,8 +76,8 @@ export default class Integrations extends React.Component {
             options.push(
                 <TeamPermissionGate
                     teamId={this.props.team.id}
-                    perms={[Permissions.MANAGE_WEBHOOKS]}
-                    key='outgoingWebhookPerm'
+                    permissions={[Permissions.MANAGE_WEBHOOKS]}
+                    key='outgoingWebhookPermission'
                 >
                     <IntegrationOption
                         key='outgoingWebhook'
@@ -104,8 +104,8 @@ export default class Integrations extends React.Component {
             options.push(
                 <TeamPermissionGate
                     teamId={this.props.team.id}
-                    perms={[Permissions.MANAGE_SLASH_COMMANDS]}
-                    key='commandPerm'
+                    permissions={[Permissions.MANAGE_SLASH_COMMANDS]}
+                    key='commandPermission'
                 >
                     <IntegrationOption
                         key='command'
@@ -131,8 +131,8 @@ export default class Integrations extends React.Component {
         if (this.props.enableOAuthServiceProvider) {
             options.push(
                 <SystemPermissionGate
-                    perms={[Permissions.MANAGE_OAUTH]}
-                    key='oauth2AppsPerm'
+                    permissions={[Permissions.MANAGE_OAUTH]}
+                    key='oauth2AppsPermission'
                 >
                     <IntegrationOption
                         key='oauth2Apps'
diff --git a/components/member_list_team/index.js b/components/member_list_team/index.js
index 2a5c38224124..8db3298cff29 100644
--- a/components/member_list_team/index.js
+++ b/components/member_list_team/index.js
@@ -4,12 +4,12 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {getTeamStats} from 'mattermost-redux/actions/teams';
-import {haveITeamPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 
 import MemberListTeam from './member_list_team.jsx';
 
 function mapStateToProps(state, ownProps) {
-    const canManageTeamMembers = haveITeamPerm(state, {team: ownProps.teamId, perm: Permissions.MANAGE_TEAM_MEMBERS});
+    const canManageTeamMembers = haveITeamPermission(state, {team: ownProps.teamId, permission: Permissions.MANAGE_TEAM_MEMBERS});
     return {
         canManageTeamMembers
     };
diff --git a/components/more_channels/more_channels.jsx b/components/more_channels/more_channels.jsx
index e00d62f32b8a..789de172ddad 100644
--- a/components/more_channels/more_channels.jsx
+++ b/components/more_channels/more_channels.jsx
@@ -135,7 +135,7 @@ export default class MoreChannels extends React.Component {
         const createNewChannelButton = (
             <TeamPermissionGate
                 teamId={TeamStore.getCurrentId()}
-                perms={[Permissions.CREATE_PUBLIC_CHANNEL]}
+                permissions={[Permissions.CREATE_PUBLIC_CHANNEL]}
             >
                 <button
                     id='createNewChannel'
@@ -154,7 +154,7 @@ export default class MoreChannels extends React.Component {
         const createChannelHelpText = (
             <TeamPermissionGate
                 teamId={TeamStore.getCurrentId()}
-                perms={[Permissions.CREATE_PUBLIC_CHANNEL]}
+                permissions={[Permissions.CREATE_PUBLIC_CHANNEL]}
             >
                 <p className='secondary-message'>
                     <FormattedMessage
diff --git a/components/navbar/navbar.jsx b/components/navbar/navbar.jsx
index 93b0966f2b23..dd622d61088a 100644
--- a/components/navbar/navbar.jsx
+++ b/components/navbar/navbar.jsx
@@ -511,7 +511,7 @@ export default class Navbar extends React.Component {
                                 <ChannelPermissionGate
                                     channelId={channel.id}
                                     teamId={teamId}
-                                    perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
+                                    permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
                                 >
                                     <FormattedMessage
                                         id='channel_header.manageMembers'
@@ -522,7 +522,7 @@ export default class Navbar extends React.Component {
                                     channelId={channel.id}
                                     teamId={teamId}
                                     invert={true}
-                                    perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
+                                    permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
                                 >
                                     <FormattedMessage
                                         id='channel_header.viewMembers'
@@ -553,7 +553,7 @@ export default class Navbar extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
                     >
                         <li role='presentation'>
                             <a
@@ -574,7 +574,7 @@ export default class Navbar extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
                     >
                         <li role='presentation'>
                             <a
@@ -595,7 +595,7 @@ export default class Navbar extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+                        permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
                     >
                         <li role='presentation'>
                             <a
@@ -616,7 +616,7 @@ export default class Navbar extends React.Component {
                     <ChannelPermissionGate
                         channelId={channel.id}
                         teamId={teamId}
-                        perms={[isPrivate ? Permissions.DELETE_PRIVATE_CHANNEL : Permissions.DELETE_PUBLIC_CHANNEL]}
+                        permissions={[isPrivate ? Permissions.DELETE_PRIVATE_CHANNEL : Permissions.DELETE_PUBLIC_CHANNEL]}
                     >
                         <li role='presentation'>
                             <ToggleModalButton
diff --git a/components/new_channel_modal/new_channel_modal.jsx b/components/new_channel_modal/new_channel_modal.jsx
index e269d8d7dabf..dde56966af59 100644
--- a/components/new_channel_modal/new_channel_modal.jsx
+++ b/components/new_channel_modal/new_channel_modal.jsx
@@ -198,7 +198,7 @@ export default class NewChannelModal extends React.PureComponent {
                     />
                     <TeamPermissionGate
                         teamId={this.props.currentTeamId}
-                        perms={[Permissions.CREATE_PUBLIC_CHANNEL]}
+                        permissions={[Permissions.CREATE_PUBLIC_CHANNEL]}
                     >
                         {createPublicChannelLink}
                     </TeamPermissionGate>
@@ -215,7 +215,7 @@ export default class NewChannelModal extends React.PureComponent {
                     />
                     <TeamPermissionGate
                         teamId={this.props.currentTeamId}
-                        perms={[Permissions.CREATE_PRIVATE_CHANNEL]}
+                        permissions={[Permissions.CREATE_PRIVATE_CHANNEL]}
                     >
                         {createPrivateChannelLink}
                     </TeamPermissionGate>
diff --git a/components/permissions_gates/channel_permission_gate/channel_permission_gate.jsx b/components/permissions_gates/channel_permission_gate/channel_permission_gate.jsx
index 3d9e7d180e18..71006fb8f648 100644
--- a/components/permissions_gates/channel_permission_gate/channel_permission_gate.jsx
+++ b/components/permissions_gates/channel_permission_gate/channel_permission_gate.jsx
@@ -7,7 +7,7 @@ import React from 'react';
 export default class ChannelPermissionGate extends React.Component {
     shouldComponentUpdate(nextProps) {
         return this.props.invert !== nextProps.invert ||
-               this.props.hasPerm !== nextProps.hasPerm;
+               this.props.hasPermission !== nextProps.hasPermission;
     }
 
     static defaultProps = {
@@ -29,12 +29,12 @@ export default class ChannelPermissionGate extends React.Component {
         /**
          * Permissions enough to pass the gate (binary OR)
          */
-        perms: PropTypes.arrayOf(PropTypes.string).isRequired,
+        permissions: PropTypes.arrayOf(PropTypes.string).isRequired,
 
         /**
          * Has permission
          */
-        hasPerm: PropTypes.bool.isRequired,
+        hasPermission: PropTypes.bool.isRequired,
 
         /**
          * Invert the permission (used for else)
@@ -48,10 +48,10 @@ export default class ChannelPermissionGate extends React.Component {
     };
 
     render() {
-        if (this.props.hasPerm && !this.props.invert) {
+        if (this.props.hasPermission && !this.props.invert) {
             return this.props.children;
         }
-        if (!this.props.hasPerm && this.props.invert) {
+        if (!this.props.hasPermission && this.props.invert) {
             return this.props.children;
         }
         return null;
diff --git a/components/permissions_gates/channel_permission_gate/index.js b/components/permissions_gates/channel_permission_gate/index.js
index f135a7299a38..13628143ae9f 100644
--- a/components/permissions_gates/channel_permission_gate/index.js
+++ b/components/permissions_gates/channel_permission_gate/index.js
@@ -3,22 +3,22 @@
 
 import {connect} from 'react-redux';
 
-import {haveIChannelPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
 
 import ChannelPermissionGate from './channel_permission_gate.jsx';
 
 function mapStateToProps(state, ownProps) {
     if (!ownProps.teamId || !ownProps.channelId) {
-        return {hasPerm: false};
+        return {hasPermission: false};
     }
 
-    for (const perm of ownProps.perms) {
-        if (haveIChannelPerm(state, {channel: ownProps.channelId, team: ownProps.teamId, perm})) {
-            return {hasPerm: true};
+    for (const permission of ownProps.permissions) {
+        if (haveIChannelPermission(state, {channel: ownProps.channelId, team: ownProps.teamId, permission})) {
+            return {hasPermission: true};
         }
     }
 
-    return {hasPerm: false};
+    return {hasPermission: false};
 }
 
 export default connect(mapStateToProps)(ChannelPermissionGate);
diff --git a/components/permissions_gates/system_permission_gate/index.js b/components/permissions_gates/system_permission_gate/index.js
index 3cf9049d9e69..ef42412235bc 100644
--- a/components/permissions_gates/system_permission_gate/index.js
+++ b/components/permissions_gates/system_permission_gate/index.js
@@ -3,18 +3,18 @@
 
 import {connect} from 'react-redux';
 
-import {haveISystemPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles';
 
 import SystemPermissionGate from './system_permission_gate.jsx';
 
 function mapStateToProps(state, ownProps) {
-    for (const perm of ownProps.perms) {
-        if (haveISystemPerm(state, {perm})) {
-            return {hasPerm: true};
+    for (const permission of ownProps.permissions) {
+        if (haveISystemPermission(state, {permission})) {
+            return {hasPermission: true};
         }
     }
 
-    return {hasPerm: false};
+    return {hasPermission: false};
 }
 
 export default connect(mapStateToProps)(SystemPermissionGate);
diff --git a/components/permissions_gates/system_permission_gate/system_permission_gate.jsx b/components/permissions_gates/system_permission_gate/system_permission_gate.jsx
index 44d7654277b9..9b8d4bc2805f 100644
--- a/components/permissions_gates/system_permission_gate/system_permission_gate.jsx
+++ b/components/permissions_gates/system_permission_gate/system_permission_gate.jsx
@@ -7,7 +7,7 @@ import React from 'react';
 export default class SystemPermissionGate extends React.Component {
     shouldComponentUpdate(nextProps) {
         return this.props.invert !== nextProps.invert ||
-               this.props.hasPerm !== nextProps.hasPerm;
+               this.props.hasPermission !== nextProps.hasPermission;
     }
 
     static defaultProps = {
@@ -19,12 +19,12 @@ export default class SystemPermissionGate extends React.Component {
         /**
          * Permissions enough to pass the gate (binary OR)
          */
-        perms: PropTypes.arrayOf(PropTypes.string).isRequired,
+        permissions: PropTypes.arrayOf(PropTypes.string).isRequired,
 
         /**
          * Has permission
          */
-        hasPerm: PropTypes.bool.isRequired,
+        hasPermission: PropTypes.bool.isRequired,
 
         /**
          * Invert the permission (used for else)
@@ -38,10 +38,10 @@ export default class SystemPermissionGate extends React.Component {
     };
 
     render() {
-        if (this.props.hasPerm && !this.props.invert) {
+        if (this.props.hasPermission && !this.props.invert) {
             return this.props.children;
         }
-        if (!this.props.hasPerm && this.props.invert) {
+        if (!this.props.hasPermission && this.props.invert) {
             return this.props.children;
         }
         return null;
diff --git a/components/permissions_gates/team_permission_gate/index.js b/components/permissions_gates/team_permission_gate/index.js
index 236dd6a1f98a..9465a43ede90 100644
--- a/components/permissions_gates/team_permission_gate/index.js
+++ b/components/permissions_gates/team_permission_gate/index.js
@@ -3,22 +3,22 @@
 
 import {connect} from 'react-redux';
 
-import {haveITeamPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 
 import TeamPermissionGate from './team_permission_gate.jsx';
 
 function mapStateToProps(state, ownProps) {
     if (!ownProps.teamId) {
-        return {hasPerm: false};
+        return {hasPermission: false};
     }
 
-    for (const perm of ownProps.perms) {
-        if (haveITeamPerm(state, {team: ownProps.teamId, perm})) {
-            return {hasPerm: true};
+    for (const permission of ownProps.permissions) {
+        if (haveITeamPermission(state, {team: ownProps.teamId, permission})) {
+            return {hasPermission: true};
         }
     }
 
-    return {hasPerm: false};
+    return {hasPermission: false};
 }
 
 export default connect(mapStateToProps)(TeamPermissionGate);
diff --git a/components/permissions_gates/team_permission_gate/team_permission_gate.jsx b/components/permissions_gates/team_permission_gate/team_permission_gate.jsx
index 3c165f9542fe..155147ac327a 100644
--- a/components/permissions_gates/team_permission_gate/team_permission_gate.jsx
+++ b/components/permissions_gates/team_permission_gate/team_permission_gate.jsx
@@ -7,7 +7,7 @@ import React from 'react';
 export default class TeamPermissionGate extends React.Component {
     shouldComponentUpdate(nextProps) {
         return this.props.invert !== nextProps.invert ||
-               this.props.hasPerm !== nextProps.hasPerm;
+               this.props.hasPermission !== nextProps.hasPermission;
     }
 
     static defaultProps = {
@@ -24,12 +24,12 @@ export default class TeamPermissionGate extends React.Component {
         /**
          * Permissions enough to pass the gate (binary OR)
          */
-        perms: PropTypes.arrayOf(PropTypes.string).isRequired,
+        permissions: PropTypes.arrayOf(PropTypes.string).isRequired,
 
         /**
          * Has permission
          */
-        hasPerm: PropTypes.bool.isRequired,
+        hasPermission: PropTypes.bool.isRequired,
 
         /**
          * Invert the permission (used for else)
@@ -43,10 +43,10 @@ export default class TeamPermissionGate extends React.Component {
     };
 
     render() {
-        if (this.props.hasPerm && !this.props.invert) {
+        if (this.props.hasPermission && !this.props.invert) {
             return this.props.children;
         }
-        if (!this.props.hasPerm && this.props.invert) {
+        if (!this.props.hasPermission && this.props.invert) {
             return this.props.children;
         }
         return null;
diff --git a/components/post_view/post_info/post_info.jsx b/components/post_view/post_info/post_info.jsx
index c595ede7695b..262254c652e9 100644
--- a/components/post_view/post_info/post_info.jsx
+++ b/components/post_view/post_info/post_info.jsx
@@ -207,7 +207,7 @@ export default class PostInfo extends React.PureComponent {
                         <ChannelPermissionGate
                             channelId={post.channel_id}
                             teamId={this.props.teamId}
-                            perms={[Permissions.ADD_REACTION]}
+                            permissions={[Permissions.ADD_REACTION]}
                         >
                             <button
                                 className='reacticon__container color--link style--none'
diff --git a/components/post_view/reaction/index.js b/components/post_view/reaction/index.js
index 6a9d903c7e2d..729077fa844d 100644
--- a/components/post_view/reaction/index.js
+++ b/components/post_view/reaction/index.js
@@ -8,7 +8,7 @@ import {getMissingProfilesByIds} from 'mattermost-redux/actions/users';
 import {getCurrentUserId, makeGetProfilesForReactions} from 'mattermost-redux/selectors/entities/users';
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getEmojiImageUrl} from 'mattermost-redux/utils/emoji_utils';
-import {haveIChannelPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
 import Permissions from 'mattermost-redux/constants/permissions';
 
 import * as Emoji from 'utils/emoji.jsx';
@@ -33,8 +33,8 @@ function makeMapStateToProps() {
         }
         const channel = getChannel(state, {id: ownProps.post.channel_id}) || {};
         const teamId = channel.team_id;
-        const canAddReaction = haveIChannelPerm(state, {team: teamId, channel: ownProps.post.channel_id, perm: Permissions.ADD_REACTION});
-        const canRemoveReaction = haveIChannelPerm(state, {team: teamId, channel: ownProps.post.channel_id, perm: Permissions.REMOVE_REACTION});
+        const canAddReaction = haveIChannelPermission(state, {team: teamId, channel: ownProps.post.channel_id, permission: Permissions.ADD_REACTION});
+        const canRemoveReaction = haveIChannelPermission(state, {team: teamId, channel: ownProps.post.channel_id, permission: Permissions.REMOVE_REACTION});
 
         return {
             profiles,
diff --git a/components/post_view/reaction_list/reaction_list.jsx b/components/post_view/reaction_list/reaction_list.jsx
index 52b8dba7be1d..24e871b65225 100644
--- a/components/post_view/reaction_list/reaction_list.jsx
+++ b/components/post_view/reaction_list/reaction_list.jsx
@@ -171,7 +171,7 @@ export default class ReactionListView extends React.PureComponent {
                         <ChannelPermissionGate
                             channelId={this.props.post.channel_id}
                             teamId={this.props.teamId}
-                            perms={[Permissions.ADD_REACTION]}
+                            permissions={[Permissions.ADD_REACTION]}
                         >
                             <div
                                 className='post-reaction'
diff --git a/components/rhs_comment/rhs_comment.jsx b/components/rhs_comment/rhs_comment.jsx
index 5166e68351fe..f84084a3ca0f 100644
--- a/components/rhs_comment/rhs_comment.jsx
+++ b/components/rhs_comment/rhs_comment.jsx
@@ -366,7 +366,7 @@ export default class RhsComment extends React.Component {
                     <ChannelPermissionGate
                         channelId={post.channel_id}
                         teamId={this.props.teamId}
-                        perms={[Permissions.ADD_REACTION]}
+                        permissions={[Permissions.ADD_REACTION]}
                     >
                         <button
                             className='reacticon__container reaction color--link style--none'
diff --git a/components/select_team/select_team.jsx b/components/select_team/select_team.jsx
index fd71645f28ba..84d647fe7989 100644
--- a/components/select_team/select_team.jsx
+++ b/components/select_team/select_team.jsx
@@ -129,14 +129,14 @@ export default class SelectTeam extends React.Component {
                 openTeamContents = (
                     <div className='signup-team-dir-err'>
                         <div>
-                            <SystemPermissionGate perms={[Permissions.CREATE_TEAM]}>
+                            <SystemPermissionGate permissions={[Permissions.CREATE_TEAM]}>
                                 <FormattedMessage
                                     id='signup_team.no_open_teams_canCreate'
                                     defaultMessage='No teams are available to join. Please create a new team or ask your administrator for an invite.'
                                 />
                             </SystemPermissionGate>
                             <SystemPermissionGate
-                                perms={[Permissions.CREATE_TEAM]}
+                                permissions={[Permissions.CREATE_TEAM]}
                                 invert={true}
                             >
                                 <FormattedMessage
@@ -169,7 +169,7 @@ export default class SelectTeam extends React.Component {
         }
 
         const teamSignUp = (
-            <SystemPermissionGate perms={[Permissions.CREATE_TEAM]}>
+            <SystemPermissionGate permissions={[Permissions.CREATE_TEAM]}>
                 <div className='margin--extra'>
                     <Link
                         to='/create_team'
@@ -187,7 +187,7 @@ export default class SelectTeam extends React.Component {
         let adminConsoleLink;
         if (!UserAgent.isMobileApp()) {
             adminConsoleLink = (
-                <SystemPermissionGate perms={[Permissions.MANAGE_SYSTEM]}>
+                <SystemPermissionGate permissions={[Permissions.MANAGE_SYSTEM]}>
                     <div className='margin--extra hidden-xs'>
                         <Link
                             to='/admin_console'
diff --git a/components/sidebar/header/dropdown/sidebar_header_dropdown.jsx b/components/sidebar/header/dropdown/sidebar_header_dropdown.jsx
index 2b9fc76a9b99..4adf11b74198 100644
--- a/components/sidebar/header/dropdown/sidebar_header_dropdown.jsx
+++ b/components/sidebar/header/dropdown/sidebar_header_dropdown.jsx
@@ -252,7 +252,7 @@ export default class SidebarHeaderDropdown extends React.Component {
             inviteLink = (
                 <TeamPermissionGate
                     teamId={this.props.teamId}
-                    perms={[Permissions.INVITE_USER]}
+                    permissions={[Permissions.INVITE_USER]}
                 >
                     <li>
                         <button
@@ -272,7 +272,7 @@ export default class SidebarHeaderDropdown extends React.Component {
             addMemberToTeam = (
                 <TeamPermissionGate
                     teamId={this.props.teamId}
-                    perms={[Permissions.ADD_USER_TO_TEAM]}
+                    permissions={[Permissions.ADD_USER_TO_TEAM]}
                 >
                     <li>
                         <button
@@ -293,7 +293,7 @@ export default class SidebarHeaderDropdown extends React.Component {
                 teamLink = (
                     <TeamPermissionGate
                         teamId={this.props.teamId}
-                        perms={[Permissions.INVITE_USER]}
+                        permissions={[Permissions.INVITE_USER]}
                     >
                         <li>
                             <button
@@ -315,7 +315,7 @@ export default class SidebarHeaderDropdown extends React.Component {
         teamSettings = (
             <TeamPermissionGate
                 teamId={this.props.teamId}
-                perms={[Permissions.MANAGE_TEAM]}
+                permissions={[Permissions.MANAGE_TEAM]}
             >
                 <li>
                     <button
@@ -341,7 +341,7 @@ export default class SidebarHeaderDropdown extends React.Component {
                 >
                     <TeamPermissionGate
                         teamId={this.props.teamId}
-                        perms={[Permissions.MANAGE_TEAM]}
+                        permissions={[Permissions.MANAGE_TEAM]}
                     >
                         <FormattedMessage
                             id='navbar_dropdown.manageMembers'
@@ -350,7 +350,7 @@ export default class SidebarHeaderDropdown extends React.Component {
                     </TeamPermissionGate>
                     <TeamPermissionGate
                         teamId={this.props.teamId}
-                        perms={[Permissions.MANAGE_TEAM]}
+                        permissions={[Permissions.MANAGE_TEAM]}
                         invert={true}
                     >
                         <FormattedMessage
@@ -369,7 +369,7 @@ export default class SidebarHeaderDropdown extends React.Component {
             this.props.enableOAuthServiceProvider;
         if (integrationsEnabled) {
             integrationsLink = (
-                <SystemPermissionGate perms={[Permissions.MANAGE_SLASH_COMMANDS, Permissions.MANAGE_OAUTH, Permissions.MANAGE_WEBHOOKS]}>
+                <SystemPermissionGate permissions={[Permissions.MANAGE_SLASH_COMMANDS, Permissions.MANAGE_OAUTH, Permissions.MANAGE_WEBHOOKS]}>
                     <li>
                         <Link
                             id='Integrations'
@@ -387,7 +387,7 @@ export default class SidebarHeaderDropdown extends React.Component {
         }
 
         sysAdminLink = (
-            <SystemPermissionGate perms={[Permissions.MANAGE_SYSTEM]}>
+            <SystemPermissionGate permissions={[Permissions.MANAGE_SYSTEM]}>
                 <li>
                     <Link
                         id='systemConsole'
@@ -408,8 +408,8 @@ export default class SidebarHeaderDropdown extends React.Component {
 
         teams.push(
             <SystemPermissionGate
-                perms={[Permissions.CREATE_TEAM]}
-                key='newTeam_perm'
+                permissions={[Permissions.CREATE_TEAM]}
+                key='newTeam_permission'
             >
                 <li key='newTeam_li'>
                     <Link
diff --git a/components/sidebar/sidebar.jsx b/components/sidebar/sidebar.jsx
index 2a125946526d..213fbb434995 100644
--- a/components/sidebar/sidebar.jsx
+++ b/components/sidebar/sidebar.jsx
@@ -714,7 +714,7 @@ export default class Sidebar extends React.PureComponent {
                                 />
                                 <TeamPermissionGate
                                     teamId={this.props.currentTeam.id}
-                                    perms={[Permissions.CREATE_PUBLIC_CHANNEL]}
+                                    permissions={[Permissions.CREATE_PUBLIC_CHANNEL]}
                                 >
                                     {createPublicChannelIcon}
                                 </TeamPermissionGate>
@@ -744,7 +744,7 @@ export default class Sidebar extends React.PureComponent {
                                 />
                                 <TeamPermissionGate
                                     teamId={this.props.currentTeam.id}
-                                    perms={[Permissions.CREATE_PRIVATE_CHANNEL]}
+                                    permissions={[Permissions.CREATE_PRIVATE_CHANNEL]}
                                 >
                                     {createPrivateChannelIcon}
                                 </TeamPermissionGate>
diff --git a/components/sidebar_right_menu/sidebar_right_menu.jsx b/components/sidebar_right_menu/sidebar_right_menu.jsx
index f79540d19497..5c518d1d1775 100644
--- a/components/sidebar_right_menu/sidebar_right_menu.jsx
+++ b/components/sidebar_right_menu/sidebar_right_menu.jsx
@@ -194,7 +194,7 @@ export default class SidebarRightMenu extends React.Component {
             inviteLink = (
                 <TeamPermissionGate
                     teamId={this.props.teamId}
-                    perms={[Permissions.INVITE_USER]}
+                    permissions={[Permissions.INVITE_USER]}
                 >
                     <li>
                         <a
@@ -214,7 +214,7 @@ export default class SidebarRightMenu extends React.Component {
             addUserToTeamLink = (
                 <TeamPermissionGate
                     teamId={this.props.teamId}
-                    perms={[Permissions.ADD_USER_TO_TEAM]}
+                    permissions={[Permissions.ADD_USER_TO_TEAM]}
                 >
                     <li>
                         <a
@@ -236,7 +236,7 @@ export default class SidebarRightMenu extends React.Component {
                 teamLink = (
                     <TeamPermissionGate
                         teamId={this.props.teamId}
-                        perms={[Permissions.INVITE_USER]}
+                        permissions={[Permissions.INVITE_USER]}
                     >
                         <li>
                             <a
@@ -282,7 +282,7 @@ export default class SidebarRightMenu extends React.Component {
             }
 
             createTeam = (
-                <SystemPermissionGate perms={[Permissions.CREATE_TEAM]}>
+                <SystemPermissionGate permissions={[Permissions.CREATE_TEAM]}>
                     <li key='newTeam_li'>
                         <Link
                             id='createTeam'
@@ -335,7 +335,7 @@ export default class SidebarRightMenu extends React.Component {
         const teamSettingsLink = (
             <TeamPermissionGate
                 teamId={this.props.teamId}
-                perms={[Permissions.MANAGE_TEAM]}
+                permissions={[Permissions.MANAGE_TEAM]}
             >
                 <li>
                     <a
@@ -354,7 +354,7 @@ export default class SidebarRightMenu extends React.Component {
         manageLink = (
             <TeamPermissionGate
                 teamId={this.props.teamId}
-                perms={[Permissions.MANAGE_TEAM]}
+                permissions={[Permissions.MANAGE_TEAM]}
             >
                 <li>
                     <ToggleModalButton
@@ -372,7 +372,7 @@ export default class SidebarRightMenu extends React.Component {
 
         if (!Utils.isMobile()) {
             consoleLink = (
-                <SystemPermissionGate perms={[Permissions.MANAGE_SYSTEM]}>
+                <SystemPermissionGate permissions={[Permissions.MANAGE_SYSTEM]}>
                     <li>
                         <Link
                             to={'/admin_console'}
diff --git a/components/team_sidebar/team_sidebar_controller.jsx b/components/team_sidebar/team_sidebar_controller.jsx
index 77d8921a8046..4999b9ea3763 100644
--- a/components/team_sidebar/team_sidebar_controller.jsx
+++ b/components/team_sidebar/team_sidebar_controller.jsx
@@ -161,7 +161,7 @@ export default class TeamSidebar extends React.Component {
         } else {
             teams.push(
                 <SystemPermissionGate
-                    perms={[Permissions.CREATE_TEAM]}
+                    permissions={[Permissions.CREATE_TEAM]}
                     key='more_teams'
                 >
                     <TeamButton
diff --git a/package.json b/package.json
index e20524bab008..9a92c90dd188 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "localforage": "1.5.6",
     "localforage-observable": "1.4.0",
     "marked": "mattermost/marked#802e981ade71149a497cbe79d12b8a3f82f7657e",
-    "mattermost-redux": "mattermost/mattermost-redux#advanced-permissions-phase-1",
+    "mattermost-redux": "mattermost/mattermost-redux#rename-perms",
     "pdfjs-dist": "2.0.290",
     "perfect-scrollbar": "0.8.1",
     "prop-types": "15.6.0",
diff --git a/tests/components/__snapshots__/new_channel_modal.test.jsx.snap b/tests/components/__snapshots__/new_channel_modal.test.jsx.snap
index 137fa3787652..a9bf5bcdde9c 100644
--- a/tests/components/__snapshots__/new_channel_modal.test.jsx.snap
+++ b/tests/components/__snapshots__/new_channel_modal.test.jsx.snap
@@ -80,7 +80,7 @@ exports[`components/NewChannelModal should match snapshot, modal not showing 1`]
               values={Object {}}
             />
             <Connect(TeamPermissionGate)
-              perms={
+              permissions={
                 Array [
                   "create_private_channel",
                 ]
@@ -361,7 +361,7 @@ exports[`components/NewChannelModal should match snapshot, modal showing 1`] = `
               values={Object {}}
             />
             <Connect(TeamPermissionGate)
-              perms={
+              permissions={
                 Array [
                   "create_private_channel",
                 ]
@@ -642,7 +642,7 @@ exports[`components/NewChannelModal should match snapshot, on displayNameError 1
               values={Object {}}
             />
             <Connect(TeamPermissionGate)
-              perms={
+              permissions={
                 Array [
                   "create_private_channel",
                 ]
@@ -932,7 +932,7 @@ exports[`components/NewChannelModal should match snapshot, on serverError 1`] =
               values={Object {}}
             />
             <Connect(TeamPermissionGate)
-              perms={
+              permissions={
                 Array [
                   "create_private_channel",
                 ]
@@ -1226,7 +1226,7 @@ exports[`components/NewChannelModal should match snapshot, private channel fille
               values={Object {}}
             />
             <Connect(TeamPermissionGate)
-              perms={
+              permissions={
                 Array [
                   "create_public_channel",
                 ]
diff --git a/tests/components/__snapshots__/permissions_gates.test.jsx.snap b/tests/components/__snapshots__/permissions_gates.test.jsx.snap
index f5f157694f42..6f497ba091a8 100644
--- a/tests/components/__snapshots__/permissions_gates.test.jsx.snap
+++ b/tests/components/__snapshots__/permissions_gates.test.jsx.snap
@@ -15,9 +15,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
 >
   <Connect(ChannelPermissionGate)
     channelId="invalid_id"
-    perms={
+    permissions={
       Array [
-        "test_channel_perm",
+        "test_channel_permission",
       ]
     }
     teamId="team_id"
@@ -25,11 +25,11 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="invalid_id"
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_channel_perm",
+          "test_channel_permission",
         ]
       }
       teamId="team_id"
@@ -52,28 +52,28 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
   }
 >
   <Connect(TeamPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_team_perm",
-        "not_existing_perm",
+        "test_team_permission",
+        "not_existing_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_team_perm",
-          "not_existing_perm",
+          "test_team_permission",
+          "not_existing_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </TeamPermissionGate>
   </Connect(TeamPermissionGate)>
@@ -95,9 +95,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
 >
   <Connect(ChannelPermissionGate)
     channelId="channel_id"
-    perms={
+    permissions={
       Array [
-        "test_channel_perm",
+        "test_channel_permission",
       ]
     }
     teamId="team_id"
@@ -105,17 +105,17 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="channel_id"
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_channel_perm",
+          "test_channel_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </ChannelPermissionGate>
   </Connect(ChannelPermissionGate)>
@@ -138,9 +138,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
   <Connect(ChannelPermissionGate)
     channelId="channel_id"
     invert={true}
-    perms={
+    permissions={
       Array [
-        "test_channel_perm",
+        "test_channel_permission",
       ]
     }
     teamId="team_id"
@@ -148,11 +148,11 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="channel_id"
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={true}
-      perms={
+      permissions={
         Array [
-          "test_channel_perm",
+          "test_channel_permission",
         ]
       }
       teamId="team_id"
@@ -176,9 +176,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
 >
   <Connect(ChannelPermissionGate)
     channelId="channel_id"
-    perms={
+    permissions={
       Array [
-        "test_system_perm",
+        "test_system_permission",
       ]
     }
     teamId="team_id"
@@ -186,17 +186,17 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="channel_id"
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_system_perm",
+          "test_system_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </ChannelPermissionGate>
   </Connect(ChannelPermissionGate)>
@@ -218,9 +218,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
 >
   <Connect(ChannelPermissionGate)
     channelId="channel_id"
-    perms={
+    permissions={
       Array [
-        "test_team_perm",
+        "test_team_permission",
       ]
     }
     teamId="team_id"
@@ -228,17 +228,17 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="channel_id"
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_team_perm",
+          "test_team_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </ChannelPermissionGate>
   </Connect(ChannelPermissionGate)>
@@ -260,9 +260,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
 >
   <Connect(ChannelPermissionGate)
     channelId="channel_id"
-    perms={
+    permissions={
       Array [
-        "invalid_perm",
+        "invalid_permission",
       ]
     }
     teamId="team_id"
@@ -270,11 +270,11 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="channel_id"
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "invalid_perm",
+          "invalid_permission",
         ]
       }
       teamId="team_id"
@@ -299,9 +299,9 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
   <Connect(ChannelPermissionGate)
     channelId="channel_id"
     invert={true}
-    perms={
+    permissions={
       Array [
-        "invalid_perm",
+        "invalid_permission",
       ]
     }
     teamId="team_id"
@@ -309,17 +309,17 @@ exports[`components/permissions_gates ChannelPermissionGate should match snapsho
     <ChannelPermissionGate
       channelId="channel_id"
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={true}
-      perms={
+      permissions={
         Array [
-          "invalid_perm",
+          "invalid_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Invalid perm but inverted (shown)
+        Invalid permission but inverted (shown)
       </p>
     </ChannelPermissionGate>
   </Connect(ChannelPermissionGate)>
@@ -340,26 +340,26 @@ exports[`components/permissions_gates SystemPermissionGate should match snapshot
   }
 >
   <Connect(SystemPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_system_perm",
-        "not_existing_perm",
+        "test_system_permission",
+        "not_existing_permission",
       ]
     }
   >
     <SystemPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_system_perm",
-          "not_existing_perm",
+          "test_system_permission",
+          "not_existing_permission",
         ]
       }
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </SystemPermissionGate>
   </Connect(SystemPermissionGate)>
@@ -380,24 +380,24 @@ exports[`components/permissions_gates SystemPermissionGate should match snapshot
   }
 >
   <Connect(SystemPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_system_perm",
+        "test_system_permission",
       ]
     }
   >
     <SystemPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_system_perm",
+          "test_system_permission",
         ]
       }
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </SystemPermissionGate>
   </Connect(SystemPermissionGate)>
@@ -419,19 +419,19 @@ exports[`components/permissions_gates SystemPermissionGate should match snapshot
 >
   <Connect(SystemPermissionGate)
     invert={true}
-    perms={
+    permissions={
       Array [
-        "test_system_perm",
+        "test_system_permission",
       ]
     }
   >
     <SystemPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={true}
-      perms={
+      permissions={
         Array [
-          "test_system_perm",
+          "test_system_permission",
         ]
       }
     />
@@ -453,19 +453,19 @@ exports[`components/permissions_gates SystemPermissionGate should match snapshot
   }
 >
   <Connect(SystemPermissionGate)
-    perms={
+    permissions={
       Array [
-        "invalid_perm",
+        "invalid_permission",
       ]
     }
   >
     <SystemPermissionGate
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "invalid_perm",
+          "invalid_permission",
         ]
       }
     />
@@ -488,24 +488,24 @@ exports[`components/permissions_gates SystemPermissionGate should match snapshot
 >
   <Connect(SystemPermissionGate)
     invert={true}
-    perms={
+    permissions={
       Array [
-        "invalid_perm",
+        "invalid_permission",
       ]
     }
   >
     <SystemPermissionGate
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={true}
-      perms={
+      permissions={
         Array [
-          "invalid_perm",
+          "invalid_permission",
         ]
       }
     >
       <p>
-        Invalid perm but inverted (shown)
+        Invalid permission but inverted (shown)
       </p>
     </SystemPermissionGate>
   </Connect(SystemPermissionGate)>
@@ -526,20 +526,20 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
   }
 >
   <Connect(TeamPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_team_perm",
+        "test_team_permission",
       ]
     }
     teamId="invalid_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_team_perm",
+          "test_team_permission",
         ]
       }
       teamId="invalid_id"
@@ -562,28 +562,28 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
   }
 >
   <Connect(TeamPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_team_perm",
-        "not_existing_perm",
+        "test_team_permission",
+        "not_existing_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_team_perm",
-          "not_existing_perm",
+          "test_team_permission",
+          "not_existing_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </TeamPermissionGate>
   </Connect(TeamPermissionGate)>
@@ -604,26 +604,26 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
   }
 >
   <Connect(TeamPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_team_perm",
+        "test_team_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_team_perm",
+          "test_team_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </TeamPermissionGate>
   </Connect(TeamPermissionGate)>
@@ -645,20 +645,20 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
 >
   <Connect(TeamPermissionGate)
     invert={true}
-    perms={
+    permissions={
       Array [
-        "test_team_perm",
+        "test_team_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={true}
-      perms={
+      permissions={
         Array [
-          "test_team_perm",
+          "test_team_permission",
         ]
       }
       teamId="team_id"
@@ -681,26 +681,26 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
   }
 >
   <Connect(TeamPermissionGate)
-    perms={
+    permissions={
       Array [
-        "test_system_perm",
+        "test_system_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={true}
+      hasPermission={true}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "test_system_perm",
+          "test_system_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Valid perm (shown)
+        Valid permission (shown)
       </p>
     </TeamPermissionGate>
   </Connect(TeamPermissionGate)>
@@ -721,20 +721,20 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
   }
 >
   <Connect(TeamPermissionGate)
-    perms={
+    permissions={
       Array [
-        "invalid_perm",
+        "invalid_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={false}
-      perms={
+      permissions={
         Array [
-          "invalid_perm",
+          "invalid_permission",
         ]
       }
       teamId="team_id"
@@ -758,26 +758,26 @@ exports[`components/permissions_gates TeamPermissionGate should match snapshot w
 >
   <Connect(TeamPermissionGate)
     invert={true}
-    perms={
+    permissions={
       Array [
-        "invalid_perm",
+        "invalid_permission",
       ]
     }
     teamId="team_id"
   >
     <TeamPermissionGate
       dispatch={[Function]}
-      hasPerm={false}
+      hasPermission={false}
       invert={true}
-      perms={
+      permissions={
         Array [
-          "invalid_perm",
+          "invalid_permission",
         ]
       }
       teamId="team_id"
     >
       <p>
-        Invalid perm but inverted (shown)
+        Invalid permission but inverted (shown)
       </p>
     </TeamPermissionGate>
   </Connect(TeamPermissionGate)>
diff --git a/tests/components/integrations/__snapshots__/abstract_oauth_app.test.jsx.snap b/tests/components/integrations/__snapshots__/abstract_oauth_app.test.jsx.snap
index 89c2dfe34100..9e71485bd759 100644
--- a/tests/components/integrations/__snapshots__/abstract_oauth_app.test.jsx.snap
+++ b/tests/components/integrations/__snapshots__/abstract_oauth_app.test.jsx.snap
@@ -35,7 +35,7 @@ exports[`components/integrations/AbstractOAuthApp should match snapshot 1`] = `
       className="form-horizontal"
     >
       <Connect(SystemPermissionGate)
-        perms={
+        permissions={
           Array [
             "manage_oauth",
           ]
@@ -355,7 +355,7 @@ exports[`components/integrations/AbstractOAuthApp should match snapshot, display
       className="form-horizontal"
     >
       <Connect(SystemPermissionGate)
-        perms={
+        permissions={
           Array [
             "manage_oauth",
           ]
diff --git a/tests/components/navbar/__snapshots__/navbar.test.jsx.snap b/tests/components/navbar/__snapshots__/navbar.test.jsx.snap
index aba79de11087..57a9bb19d223 100644
--- a/tests/components/navbar/__snapshots__/navbar.test.jsx.snap
+++ b/tests/components/navbar/__snapshots__/navbar.test.jsx.snap
@@ -193,7 +193,7 @@ exports[`components/navbar/Navbar should match snapshot, for private channel 1`]
                 >
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
-                    perms={
+                    permissions={
                       Array [
                         "manage_private_channel_members",
                       ]
@@ -209,7 +209,7 @@ exports[`components/navbar/Navbar should match snapshot, for private channel 1`]
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
                     invert={true}
-                    perms={
+                    permissions={
                       Array [
                         "manage_private_channel_members",
                       ]
@@ -226,7 +226,7 @@ exports[`components/navbar/Navbar should match snapshot, for private channel 1`]
               </li>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_private_channel_properties",
                   ]
@@ -251,7 +251,7 @@ exports[`components/navbar/Navbar should match snapshot, for private channel 1`]
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_private_channel_properties",
                   ]
@@ -276,7 +276,7 @@ exports[`components/navbar/Navbar should match snapshot, for private channel 1`]
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_private_channel_properties",
                   ]
@@ -301,7 +301,7 @@ exports[`components/navbar/Navbar should match snapshot, for private channel 1`]
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "delete_private_channel",
                   ]
@@ -612,7 +612,7 @@ exports[`components/navbar/Navbar should match snapshot, if WebRTC is not enable
                 >
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
-                    perms={
+                    permissions={
                       Array [
                         "manage_public_channel_members",
                       ]
@@ -628,7 +628,7 @@ exports[`components/navbar/Navbar should match snapshot, if WebRTC is not enable
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
                     invert={true}
-                    perms={
+                    permissions={
                       Array [
                         "manage_public_channel_members",
                       ]
@@ -645,7 +645,7 @@ exports[`components/navbar/Navbar should match snapshot, if WebRTC is not enable
               </li>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -670,7 +670,7 @@ exports[`components/navbar/Navbar should match snapshot, if WebRTC is not enable
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -695,7 +695,7 @@ exports[`components/navbar/Navbar should match snapshot, if WebRTC is not enable
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -720,7 +720,7 @@ exports[`components/navbar/Navbar should match snapshot, if WebRTC is not enable
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "delete_public_channel",
                   ]
@@ -1217,7 +1217,7 @@ exports[`components/navbar/Navbar should match snapshot, if not licensed 1`] = `
                 >
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
-                    perms={
+                    permissions={
                       Array [
                         "manage_public_channel_members",
                       ]
@@ -1233,7 +1233,7 @@ exports[`components/navbar/Navbar should match snapshot, if not licensed 1`] = `
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
                     invert={true}
-                    perms={
+                    permissions={
                       Array [
                         "manage_public_channel_members",
                       ]
@@ -1250,7 +1250,7 @@ exports[`components/navbar/Navbar should match snapshot, if not licensed 1`] = `
               </li>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -1275,7 +1275,7 @@ exports[`components/navbar/Navbar should match snapshot, if not licensed 1`] = `
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -1300,7 +1300,7 @@ exports[`components/navbar/Navbar should match snapshot, if not licensed 1`] = `
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -1325,7 +1325,7 @@ exports[`components/navbar/Navbar should match snapshot, if not licensed 1`] = `
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "delete_public_channel",
                   ]
@@ -1638,7 +1638,7 @@ exports[`components/navbar/Navbar should match snapshot, valid state 1`] = `
                 >
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
-                    perms={
+                    permissions={
                       Array [
                         "manage_public_channel_members",
                       ]
@@ -1654,7 +1654,7 @@ exports[`components/navbar/Navbar should match snapshot, valid state 1`] = `
                   <Connect(ChannelPermissionGate)
                     channelId="channel_id"
                     invert={true}
-                    perms={
+                    permissions={
                       Array [
                         "manage_public_channel_members",
                       ]
@@ -1671,7 +1671,7 @@ exports[`components/navbar/Navbar should match snapshot, valid state 1`] = `
               </li>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -1696,7 +1696,7 @@ exports[`components/navbar/Navbar should match snapshot, valid state 1`] = `
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -1721,7 +1721,7 @@ exports[`components/navbar/Navbar should match snapshot, valid state 1`] = `
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "manage_public_channel_properties",
                   ]
@@ -1746,7 +1746,7 @@ exports[`components/navbar/Navbar should match snapshot, valid state 1`] = `
               </Connect(ChannelPermissionGate)>
               <Connect(ChannelPermissionGate)
                 channelId="channel_id"
-                perms={
+                permissions={
                   Array [
                     "delete_public_channel",
                   ]
diff --git a/tests/components/permissions_gates.test.jsx b/tests/components/permissions_gates.test.jsx
index 07f44d30d87a..355bb0413c54 100644
--- a/tests/components/permissions_gates.test.jsx
+++ b/tests/components/permissions_gates.test.jsx
@@ -35,9 +35,9 @@ describe('components/permissions_gates', () => {
             },
             roles: {
                 roles: {
-                    system_role: {permissions: ['test_system_perm']},
-                    team_role: {permissions: ['test_team_perm']},
-                    channel_role: {permissions: ['test_channel_perm']}
+                    system_role: {permissions: ['test_system_permission']},
+                    team_role: {permissions: ['test_team_permission']},
+                    channel_role: {permissions: ['test_channel_permission']}
                 }
             }
         }
@@ -48,8 +48,8 @@ describe('components/permissions_gates', () => {
         test('should match snapshot when user have permission', () => {
             const wrapper = mount(
                 <Provider store={store}>
-                    <SystemPermissionGate perms={['test_system_perm']}>
-                        <p>{'Valid perm (shown)'}</p>
+                    <SystemPermissionGate permissions={['test_system_permission']}>
+                        <p>{'Valid permission (shown)'}</p>
                     </SystemPermissionGate>
                 </Provider>
             );
@@ -59,8 +59,8 @@ describe('components/permissions_gates', () => {
         test('should match snapshot when user have at least on of the permissions', () => {
             const wrapper = mount(
                 <Provider store={store}>
-                    <SystemPermissionGate perms={['test_system_perm', 'not_existing_perm']}>
-                        <p>{'Valid perm (shown)'}</p>
+                    <SystemPermissionGate permissions={['test_system_permission', 'not_existing_permission']}>
+                        <p>{'Valid permission (shown)'}</p>
                     </SystemPermissionGate>
                 </Provider>
             );
@@ -71,10 +71,10 @@ describe('components/permissions_gates', () => {
             const wrapper = mount(
                 <Provider store={store}>
                     <SystemPermissionGate
-                        perms={['test_system_perm']}
+                        permissions={['test_system_permission']}
                         invert={true}
                     >
-                        <p>{'Valid perm but inverted (not shown)'}</p>
+                        <p>{'Valid permission but inverted (not shown)'}</p>
                     </SystemPermissionGate>
                 </Provider>
             );
@@ -85,10 +85,10 @@ describe('components/permissions_gates', () => {
             const wrapper = mount(
                 <Provider store={store}>
                     <SystemPermissionGate
-                        perms={['invalid_perm']}
+                        permissions={['invalid_permission']}
                         invert={true}
                     >
-                        <p>{'Invalid perm but inverted (shown)'}</p>
+                        <p>{'Invalid permission but inverted (shown)'}</p>
                     </SystemPermissionGate>
                 </Provider>
             );
@@ -98,8 +98,8 @@ describe('components/permissions_gates', () => {
         test('should match snapshot when user haven\'t permission', () => {
             const wrapper = mount(
                 <Provider store={store}>
-                    <SystemPermissionGate perms={['invalid_perm']}>
-                        <p>{'Invalid perm (not shown)'}</p>
+                    <SystemPermissionGate permissions={['invalid_permission']}>
+                        <p>{'Invalid permission (not shown)'}</p>
                     </SystemPermissionGate>
                 </Provider>
             );
@@ -114,9 +114,9 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['test_team_perm']}
+                        permissions={['test_team_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -128,9 +128,9 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['test_team_perm', 'not_existing_perm']}
+                        permissions={['test_team_permission', 'not_existing_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -142,10 +142,10 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['test_team_perm']}
+                        permissions={['test_team_permission']}
                         invert={true}
                     >
-                        <p>{'Valid perm but inverted (not shown)'}</p>
+                        <p>{'Valid permission but inverted (not shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -157,10 +157,10 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['invalid_perm']}
+                        permissions={['invalid_permission']}
                         invert={true}
                     >
-                        <p>{'Invalid perm but inverted (shown)'}</p>
+                        <p>{'Invalid permission but inverted (shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -172,9 +172,9 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['invalid_perm']}
+                        permissions={['invalid_permission']}
                     >
-                        <p>{'Invalid perm (not shown)'}</p>
+                        <p>{'Invalid permission (not shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -186,9 +186,9 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'invalid_id'}
-                        perms={['test_team_perm']}
+                        permissions={['test_team_permission']}
                     >
-                        <p>{'Valid perm invalid team (not shown)'}</p>
+                        <p>{'Valid permission invalid team (not shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -200,9 +200,9 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['test_system_perm']}
+                        permissions={['test_system_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -218,9 +218,9 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'channel_id'}
                         teamId={'team_id'}
-                        perms={['test_channel_perm']}
+                        permissions={['test_channel_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
@@ -232,9 +232,9 @@ describe('components/permissions_gates', () => {
                 <Provider store={store}>
                     <TeamPermissionGate
                         teamId={'team_id'}
-                        perms={['test_team_perm', 'not_existing_perm']}
+                        permissions={['test_team_permission', 'not_existing_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </TeamPermissionGate>
                 </Provider>
             );
@@ -247,10 +247,10 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'channel_id'}
                         teamId={'team_id'}
-                        perms={['test_channel_perm']}
+                        permissions={['test_channel_permission']}
                         invert={true}
                     >
-                        <p>{'Valid perm but inverted (not shown)'}</p>
+                        <p>{'Valid permission but inverted (not shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
@@ -263,10 +263,10 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'channel_id'}
                         teamId={'team_id'}
-                        perms={['invalid_perm']}
+                        permissions={['invalid_permission']}
                         invert={true}
                     >
-                        <p>{'Invalid perm but inverted (shown)'}</p>
+                        <p>{'Invalid permission but inverted (shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
@@ -279,9 +279,9 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'channel_id'}
                         teamId={'team_id'}
-                        perms={['invalid_perm']}
+                        permissions={['invalid_permission']}
                     >
-                        <p>{'Invalid perm (not shown)'}</p>
+                        <p>{'Invalid permission (not shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
@@ -294,9 +294,9 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'invalid_id'}
                         teamId={'team_id'}
-                        perms={['test_channel_perm']}
+                        permissions={['test_channel_permission']}
                     >
-                        <p>{'Valid perm invalid channel (not shown)'}</p>
+                        <p>{'Valid permission invalid channel (not shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
@@ -309,9 +309,9 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'channel_id'}
                         teamId={'team_id'}
-                        perms={['test_team_perm']}
+                        permissions={['test_team_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
@@ -324,9 +324,9 @@ describe('components/permissions_gates', () => {
                     <ChannelPermissionGate
                         channelId={'channel_id'}
                         teamId={'team_id'}
-                        perms={['test_system_perm']}
+                        permissions={['test_system_permission']}
                     >
-                        <p>{'Valid perm (shown)'}</p>
+                        <p>{'Valid permission (shown)'}</p>
                     </ChannelPermissionGate>
                 </Provider>
             );
diff --git a/tests/components/sidebar/__snapshots__/sidebar.test.jsx.snap b/tests/components/sidebar/__snapshots__/sidebar.test.jsx.snap
index e1cf2a1db443..acdee4fcc642 100644
--- a/tests/components/sidebar/__snapshots__/sidebar.test.jsx.snap
+++ b/tests/components/sidebar/__snapshots__/sidebar.test.jsx.snap
@@ -67,7 +67,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should match snapshot,
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -150,7 +150,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should match snapshot,
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -415,7 +415,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should match snapshot,
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -498,7 +498,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should match snapshot,
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -756,7 +756,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should match snapshot,
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -839,7 +839,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should match snapshot,
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -1076,7 +1076,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -1159,7 +1159,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -1388,7 +1388,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -1471,7 +1471,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -1704,7 +1704,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -1787,7 +1787,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -2016,7 +2016,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -2099,7 +2099,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -2328,7 +2328,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -2411,7 +2411,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
@@ -2640,7 +2640,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_public_channel",
               ]
@@ -2723,7 +2723,7 @@ exports[`component/sidebar/sidebar_channel/SidebarChannel should show/hide corre
             values={Object {}}
           />
           <Connect(TeamPermissionGate)
-            perms={
+            permissions={
               Array [
                 "create_private_channel",
               ]
diff --git a/utils/channel_intro_messages.jsx b/utils/channel_intro_messages.jsx
index eeeb520d28d8..e3455a88de95 100644
--- a/utils/channel_intro_messages.jsx
+++ b/utils/channel_intro_messages.jsx
@@ -183,7 +183,7 @@ export function createOffTopicIntroMessage(channel, centeredIntro) {
         <ChannelPermissionGate
             teamId={teamId}
             channelId={channel.id}
-            perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+            permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
         >
             {createSetHeaderButton(channel)}
         </ChannelPermissionGate>
@@ -213,7 +213,7 @@ export function createDefaultIntroMessage(channel, centeredIntro) {
     const teamInviteLink = (
         <TeamPermissionGate
             teamId={channel.team_id}
-            perms={[Permissions.INVITE_USER]}
+            permissions={[Permissions.INVITE_USER]}
         >
             <span
                 className='intro-links color--link cursor--pointer'
@@ -234,7 +234,7 @@ export function createDefaultIntroMessage(channel, centeredIntro) {
         <ChannelPermissionGate
             teamId={teamId}
             channelId={channel.id}
-            perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+            permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
         >
             {createSetHeaderButton(channel)}
         </ChannelPermissionGate>
@@ -354,7 +354,7 @@ export function createStandardIntroMessage(channel, centeredIntro) {
         <ChannelPermissionGate
             teamId={teamId}
             channelId={channel.id}
-            perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
+            permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES : Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES]}
         >
             {createSetHeaderButton(channel)}
         </ChannelPermissionGate>
@@ -394,7 +394,7 @@ function createInviteChannelMemberButton(channel, uiType) {
         <ChannelPermissionGate
             channelId={channel.id}
             teamId={channel.team_id}
-            perms={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
+            permissions={[isPrivate ? Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS : Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS]}
         >
             <ToggleModalButton
                 className='intro-links color--link'
diff --git a/utils/channel_utils.jsx b/utils/channel_utils.jsx
index ef739864420a..30ff90feb091 100644
--- a/utils/channel_utils.jsx
+++ b/utils/channel_utils.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {haveIChannelPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
 import Permissions from 'mattermost-redux/constants/permissions';
 import * as ChannelUtilsRedux from 'mattermost-redux/utils/channel_utils';
 
@@ -54,23 +54,23 @@ export function getChannelDisplayName(channel) {
 
 export function canManageMembers(channel) {
     if (channel.type === Constants.PRIVATE_CHANNEL) {
-        return haveIChannelPerm(
+        return haveIChannelPermission(
             store.getState(),
             {
                 channelId: channel.id,
                 teamId: channel.team_id,
-                perm: Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS
+                permission: Permissions.MANAGE_PRIVATE_CHANNEL_MEMBERS
             }
         );
     }
 
     if (channel.type === Constants.OPEN_CHANNEL) {
-        return haveIChannelPerm(
+        return haveIChannelPermission(
             store.getState(),
             {
                 channelId: channel.id,
                 teamId: channel.team_id,
-                perm: Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS
+                permission: Permissions.MANAGE_PUBLIC_CHANNEL_MEMBERS
             }
         );
     }
diff --git a/utils/post_utils.jsx b/utils/post_utils.jsx
index 41c54229e5e0..23d52cfcd891 100644
--- a/utils/post_utils.jsx
+++ b/utils/post_utils.jsx
@@ -5,7 +5,7 @@ import React from 'react';
 import {Parser, ProcessNodeDefinitions} from 'html-to-react';
 import {Client4} from 'mattermost-redux/client';
 
-import {haveIChannelPerm} from 'mattermost-redux/selectors/entities/roles';
+import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
 import {Permissions} from 'mattermost-redux/constants';
 
 import AtMention from 'components/at_mention';
@@ -78,9 +78,9 @@ export function canDeletePost(post) {
     }
 
     if (isPostOwner(post)) {
-        return haveIChannelPerm(store.getState(), {channel: post.channel_id, team: post.team_id, perm: Permissions.DELETE_POST});
+        return haveIChannelPermission(store.getState(), {channel: post.channel_id, team: post.team_id, permission: Permissions.DELETE_POST});
     }
-    return haveIChannelPerm(store.getState(), {channel: post.channel_id, team: post.team_id, perm: Permissions.DELETE_OTHERS_POSTS});
+    return haveIChannelPermission(store.getState(), {channel: post.channel_id, team: post.team_id, permission: Permissions.DELETE_OTHERS_POSTS});
 }
 
 export function canEditPost(post, editDisableAction) {
@@ -90,9 +90,9 @@ export function canEditPost(post, editDisableAction) {
 
     let canEdit = false;
     const isOwner = isPostOwner(post);
-    canEdit = haveIChannelPerm(store.getState(), {channel: post.channel_id, team: post.team_id, perm: Permissions.EDIT_POST});
+    canEdit = haveIChannelPermission(store.getState(), {channel: post.channel_id, team: post.team_id, permission: Permissions.EDIT_POST});
     if (!isOwner) {
-        canEdit = canEdit && haveIChannelPerm(store.getState(), {channel: post.channel_id, team: post.team_id, perm: Permissions.EDIT_OTHERS_POSTS});
+        canEdit = canEdit && haveIChannelPermission(store.getState(), {channel: post.channel_id, team: post.team_id, permission: Permissions.EDIT_OTHERS_POSTS});
     }
 
     if (canEdit && global.window.mm_license.IsLicensed === 'true') {
diff --git a/yarn.lock b/yarn.lock
index 94b259b57cf6..a331dd19bbd7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5582,7 +5582,7 @@ math-expression-evaluator@^1.2.14:
 
 mattermost-redux@mattermost/mattermost-redux#advanced-permissions-phase-1:
   version "1.2.0"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/bd088b10de96c562ef4cdb92d6f63260f8af95c0"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/4c30b1e2a87a4cea4a1d2071ccc4d682ab6ed7ca"
   dependencies:
     deep-equal "1.0.1"
     form-data "2.3.1"