diff --git a/src/actions/RoomActions.js b/src/actions/RoomActions.js
index d6ea652..5fd34c6 100644
--- a/src/actions/RoomActions.js
+++ b/src/actions/RoomActions.js
@@ -1,6 +1,6 @@
 import {
     ROOM_JOIN,
-    ROOM_SAY,
+    ROOM_MESSAGE,
     ROOM_SELECT
 } from "../constants/ActionTypes";
 
@@ -24,14 +24,14 @@ export default ({
         payload: room
     }),
 
-    say: (room, message) => (dispatch) => {
+    sendMessage: (room, message) => (dispatch) => {
         dispatch({
-            type: ROOM_SAY,
+            type: ROOM_MESSAGE,
             payload: {
                 room_name: room,
                 message
             }
         });
-        dispatch(SocketActions.send(ControlRequest.sayRoom(room, message)));
+        dispatch(SocketActions.send(ControlRequest.roomMessage(room, message)));
     }
 });
diff --git a/src/components/RoomChatForm.js b/src/components/RoomChatForm.js
index d36f51c..2016f4d 100644
--- a/src/components/RoomChatForm.js
+++ b/src/components/RoomChatForm.js
@@ -2,10 +2,10 @@ import React, {PropTypes} from "react";
 import {reduxForm} from "redux-form";
 
 const RoomChatForm = (props) => {
-    const { fields: { message }, handleSubmit, name, say } = props;
+    const { fields: { message }, handleSubmit, name, sendMessage } = props;
 
     const onSubmit = handleSubmit((values) => {
-        say(name, values.message);
+        sendMessage(name, values.message);
     });
 
     return (
@@ -20,10 +20,12 @@ const RoomChatForm = (props) => {
 };
 
 RoomChatForm.propTypes = {
-    fields: PropTypes.object.isRequired,
+    fields: PropTypes.shape({
+        message: PropTypes.string.isRequired
+    }),
     handleSubmit: PropTypes.func.isRequired,
     name: PropTypes.string,
-    say: PropTypes.func.isRequired
+    sendMessage: PropTypes.func.isRequired
 };
 
 export default reduxForm({
diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
index b31c0b5..67421e3 100644
--- a/src/constants/ActionTypes.js
+++ b/src/constants/ActionTypes.js
@@ -8,6 +8,6 @@ export const SOCKET_RECEIVE_MESSAGE = "SOCKET_RECEIVE_MESSAGE";
 export const SOCKET_SEND_MESSAGE    = "SOCKET_SEND_MESSAGE";
 
 // Room actions
-export const ROOM_SELECT = "ROOM_SELECT";
-export const ROOM_JOIN   = "ROOM_JOIN";
-export const ROOM_SAY    = "ROOM_SAY";
+export const ROOM_SELECT  = "ROOM_SELECT";
+export const ROOM_JOIN    = "ROOM_JOIN";
+export const ROOM_MESSAGE = "ROOM_MESSAGE";
diff --git a/src/containers/RoomChat.js b/src/containers/RoomChat.js
index a9141f0..24671b2 100644
--- a/src/containers/RoomChat.js
+++ b/src/containers/RoomChat.js
@@ -64,7 +64,10 @@ class RoomChat extends React.Component {
                     login_user_name={login_user_name}
                     messages={room.messages}
                 />
-                <RoomChatForm name={name} say={roomActions.say} />
+                <RoomChatForm
+                    name={name}
+                    sendMessage={roomActions.sendMessage}
+                />
             </div>
         );
     }
@@ -79,7 +82,7 @@ RoomChat.propTypes = {
     }),
     roomActions: PropTypes.shape({
         join: PropTypes.func.isRequired,
-        say:  PropTypes.func.isRequired
+        sendMessage:  PropTypes.func.isRequired
     }).isRequired
 };
 
diff --git a/src/reducers/rooms.js b/src/reducers/rooms.js
index 5a30646..2eadaf8 100644
--- a/src/reducers/rooms.js
+++ b/src/reducers/rooms.js
@@ -2,7 +2,7 @@ import Immutable from "immutable";
 
 import {
     ROOM_JOIN,
-    ROOM_SAY,
+    ROOM_MESSAGE,
     ROOM_SELECT,
     SOCKET_RECEIVE_MESSAGE
 } from "../constants/ActionTypes";
@@ -58,7 +58,7 @@ const reduceReceiveMessage = (rooms, { variant, data }) => {
         case "RoomListResponse":
             return reduceRoomList(rooms, data.rooms);
 
-        case "SayRoomResponse":
+        case "RoomMessageResponse":
         {
             const { room_name, user_name, message } = data;
             const room_data = rooms.get(room_name);
@@ -87,7 +87,7 @@ export default (state = initialState, action) => {
                 rooms: reduceReceiveMessage(state.rooms, payload)
             };
 
-        case ROOM_SAY:
+        case ROOM_MESSAGE:
             return state;
 
         case ROOM_SELECT:
diff --git a/src/utils/ControlRequest.js b/src/utils/ControlRequest.js
index 44146fa..326d25b 100644
--- a/src/utils/ControlRequest.js
+++ b/src/utils/ControlRequest.js
@@ -14,8 +14,8 @@ export default {
         fields: []
     }),
 
-    sayRoom: (room_name, message) => ({
-        variant: "SayRoomRequest",
+    roomMessage: (room_name, message) => ({
+        variant: "RoomMessageRequest",
         fields: [{
             room_name,
             message