diff --git a/app/actions/actionsTypes.js b/app/actions/actionsTypes.js
index 856086402..2593bd09a 100644
--- a/app/actions/actionsTypes.js
+++ b/app/actions/actionsTypes.js
@@ -41,9 +41,9 @@ export const MESSAGES = createRequestTypes('MESSAGES', [
 	'EDIT_REQUEST',
 	'EDIT_SUCCESS',
 	'EDIT_FAILURE',
-	'STAR_REQUEST',
-	'STAR_SUCCESS',
-	'STAR_FAILURE',
+	'TOGGLE_STAR_REQUEST',
+	'TOGGLE_STAR_SUCCESS',
+	'TOGGLE_STAR_FAILURE',
 	'PERMALINK_REQUEST',
 	'PERMALINK_SUCCESS',
 	'PERMALINK_FAILURE',
diff --git a/app/actions/messages.js b/app/actions/messages.js
index b333d39a1..5d45b2886 100644
--- a/app/actions/messages.js
+++ b/app/actions/messages.js
@@ -85,22 +85,22 @@ export function editFailure() {
 	};
 }
 
-export function starRequest(message) {
+export function toggleStarRequest(message) {
 	return {
-		type: types.MESSAGES.STAR_REQUEST,
+		type: types.MESSAGES.TOGGLE_STAR_REQUEST,
 		message
 	};
 }
 
-export function starSuccess() {
+export function toggleStarSuccess() {
 	return {
-		type: types.MESSAGES.STAR_SUCCESS
+		type: types.MESSAGES.TOGGLE_STAR_SUCCESS
 	};
 }
 
-export function starFailure() {
+export function toggleStarFailure() {
 	return {
-		type: types.MESSAGES.STAR_FAILURE
+		type: types.MESSAGES.TOGGLE_STAR_FAILURE
 	};
 }
 
diff --git a/app/containers/MessageActions.js b/app/containers/MessageActions.js
index 12422da27..ba6aa5e34 100644
--- a/app/containers/MessageActions.js
+++ b/app/containers/MessageActions.js
@@ -8,7 +8,7 @@ import * as moment from 'moment';
 import {
 	deleteRequest,
 	editInit,
-	starRequest,
+	toggleStarRequest,
 	permalinkRequest,
 	permalinkClear,
 	togglePinRequest,
@@ -34,7 +34,7 @@ import {
 		actionsHide: () => dispatch(actionsHide()),
 		deleteRequest: message => dispatch(deleteRequest(message)),
 		editInit: message => dispatch(editInit(message)),
-		starRequest: message => dispatch(starRequest(message)),
+		toggleStarRequest: message => dispatch(toggleStarRequest(message)),
 		permalinkRequest: message => dispatch(permalinkRequest(message)),
 		permalinkClear: () => dispatch(permalinkClear()),
 		togglePinRequest: message => dispatch(togglePinRequest(message)),
@@ -51,7 +51,7 @@ export default class MessageActions extends React.Component {
 		permissions: PropTypes.object.isRequired,
 		deleteRequest: PropTypes.func.isRequired,
 		editInit: PropTypes.func.isRequired,
-		starRequest: PropTypes.func.isRequired,
+		toggleStarRequest: PropTypes.func.isRequired,
 		permalinkRequest: PropTypes.func.isRequired,
 		permalinkClear: PropTypes.func.isRequired,
 		togglePinRequest: PropTypes.func.isRequired,
@@ -230,7 +230,7 @@ export default class MessageActions extends React.Component {
 	}
 
 	handleStar() {
-		this.props.starRequest(this.props.actionMessage);
+		this.props.toggleStarRequest(this.props.actionMessage);
 	}
 
 	handlePermalink() {
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 6be423277..30090f8d8 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -482,7 +482,7 @@ const RocketChat = {
 		const { _id, msg, rid } = message;
 		return call('updateMessage', { _id, msg, rid });
 	},
-	starMessage(message) {
+	toggleStarMessage(message) {
 		return call('starMessage', { _id: message._id, rid: message.rid, starred: !message.starred });
 	},
 	togglePinMessage(message) {
diff --git a/app/sagas/messages.js b/app/sagas/messages.js
index b3d54db3e..4f806aaec 100644
--- a/app/sagas/messages.js
+++ b/app/sagas/messages.js
@@ -7,8 +7,8 @@ import {
 	deleteFailure,
 	editSuccess,
 	editFailure,
-	starSuccess,
-	starFailure,
+	toggleStarSuccess,
+	toggleStarFailure,
 	permalinkSuccess,
 	permalinkFailure,
 	togglePinSuccess,
@@ -18,7 +18,7 @@ import RocketChat from '../lib/rocketchat';
 
 const deleteMessage = message => RocketChat.deleteMessage(message);
 const editMessage = message => RocketChat.editMessage(message);
-const starMessage = message => RocketChat.starMessage(message);
+const toggleStarMessage = message => RocketChat.toggleStarMessage(message);
 const getPermalink = message => RocketChat.getPermalink(message);
 const togglePinMessage = message => RocketChat.togglePinMessage(message);
 
@@ -54,12 +54,12 @@ const handleEditRequest = function* handleEditRequest({ message }) {
 	}
 };
 
-const handleStarRequest = function* handleStarRequest({ message }) {
+const handleToggleStarRequest = function* handleToggleStarRequest({ message }) {
 	try {
-		yield call(starMessage, message);
-		yield put(starSuccess());
+		yield call(toggleStarMessage, message);
+		yield put(toggleStarSuccess());
 	} catch (error) {
-		yield put(starFailure());
+		yield put(toggleStarFailure());
 	}
 };
 
@@ -85,7 +85,7 @@ const root = function* root() {
 	yield takeLatest(MESSAGES.REQUEST, get);
 	yield takeLatest(MESSAGES.DELETE_REQUEST, handleDeleteRequest);
 	yield takeLatest(MESSAGES.EDIT_REQUEST, handleEditRequest);
-	yield takeLatest(MESSAGES.STAR_REQUEST, handleStarRequest);
+	yield takeLatest(MESSAGES.TOGGLE_STAR_REQUEST, handleToggleStarRequest);
 	yield takeLatest(MESSAGES.PERMALINK_REQUEST, handlePermalinkRequest);
 	yield takeLatest(MESSAGES.TOGGLE_PIN_REQUEST, handleTogglePinRequest);
 };