diff --git a/src/Chat.tsx b/src/Chat.tsx
index 9c13b6d31d..47caac37b4 100644
--- a/src/Chat.tsx
+++ b/src/Chat.tsx
@@ -6,7 +6,7 @@ import { Subscription } from 'rxjs/Subscription';
 
 import { Activity, Media, IBotConnection, User, MediaType, DirectLine, DirectLineOptions } from 'botframework-directlinejs';
 import { History } from './History';
-import { SuggestedActions } from './MessagePane';
+import { MessagePane } from './MessagePane';
 import { Shell } from './Shell';
 import { createStore, ChatActions, ChatStore } from './Store';
 import { Dispatch, Provider } from 'react-redux';
@@ -151,9 +151,9 @@ export class Chat extends React.Component<ChatProps, {}> {
             <Provider store={ this.store }>
                 <div className="wc-chatview-panel" ref={ div => this.chatviewPanel = div }>
                     { header }
-                    <SuggestedActions>
+                    <MessagePane>
                         <History/>
-                    </SuggestedActions>
+                    </MessagePane>
                     <Shell />
                     { resize }
                 </div>
diff --git a/src/MessagePane.tsx b/src/MessagePane.tsx
index 27a8e607e2..ae3400708b 100644
--- a/src/MessagePane.tsx
+++ b/src/MessagePane.tsx
@@ -12,14 +12,13 @@ export interface MessagePaneProps {
     children: React.ReactNode
 }
 
-const MessagePane = (props: MessagePaneProps) => {
+const MessagePaneView = (props: MessagePaneProps) =>
     <div className={ classList('wc-message-pane', props.actions && 'show-actions' ) }>
         { props.children }
-        <SuggestedActionsView { ... props }/>
-    </div>
-};
+        <SuggestedActions { ... props }/>
+    </div>;
 
-export class SuggestedActionsView extends React.Component<MessagePaneProps, {}> {
+class SuggestedActions extends React.Component<MessagePaneProps, {}> {
     constructor(props: MessagePaneProps) {
         super(props);
     }
@@ -59,7 +58,7 @@ export class SuggestedActionsView extends React.Component<MessagePaneProps, {}>
 
 }
 
-export function suggestedActions(activities: Activity[]) {
+function suggestedActions(activities: Activity[]) {
     if (!activities || activities.length === 0)
         return;
     const lastActivity = activities[activities.length - 1];
@@ -68,7 +67,7 @@ export function suggestedActions(activities: Activity[]) {
     return lastActivity.suggestedActions;
 }
 
-export const SuggestedActions = connect(
+export const MessagePane = connect(
     (state: ChatState): Partial<MessagePaneProps> => ({
         actions: suggestedActions(state.history.activities),
         doCardAction: doCardAction(state.connection.botConnection, state.connection.user, state.format.locale),
@@ -76,4 +75,4 @@ export const SuggestedActions = connect(
     (dispatch: Dispatch<any>): Partial<MessagePaneProps> => ({
         sendMessage: (value: string, user: User, locale: string) => sendMessage(dispatch, value, user, locale)
     })
-)(MessagePane);
\ No newline at end of file
+)(MessagePaneView);