diff --git a/src/emqttd_sm.erl b/src/emqttd_sm.erl
index a7cfb1724..0be4524c7 100644
--- a/src/emqttd_sm.erl
+++ b/src/emqttd_sm.erl
@@ -85,7 +85,7 @@ start_session(CleanSess, ClientId) ->
 %% @doc Lookup a Session
 -spec(lookup_session(binary()) -> mqtt_session() | undefined).
 lookup_session(ClientId) ->
-    case mnesia:dirty_read(session, ClientId) of
+    case mnesia:dirty_read(mqtt_session, ClientId) of
         [Session] -> Session;
         []        -> undefined
     end.
@@ -166,11 +166,13 @@ handle_info({'DOWN', MRef, process, DownPid, _Reason}, State) ->
     case dict:find(MRef, State#state.monitors) of
         {ok, ClientId} ->
             mnesia:transaction(fun() ->
-                case mnesia:wread({session, ClientId}) of
-                    [] -> ok;
+                case mnesia:wread({mqtt_session, ClientId}) of
+                    [] ->
+                        ok;
                     [Sess = #mqtt_session{sess_pid = DownPid}] ->
-                        mnesia:delete_object(session, Sess, write);
-                    [_Sess] -> ok
+                        mnesia:delete_object(mqtt_session, Sess, write);
+                    [_Sess] ->
+                        ok
                     end
                 end),
             {noreply, erase_monitor(MRef, State), hibernate};
@@ -221,9 +223,9 @@ create_session(CleanSess, ClientId, ClientPid) ->
 insert_session(Session = #mqtt_session{client_id = ClientId}) ->
     mnesia:transaction(
       fun() ->
-        case mnesia:wread({session, ClientId}) of
+        case mnesia:wread({mqtt_session, ClientId}) of
             [] ->
-                mnesia:write(session, Session, write);
+                mnesia:write(mqtt_session, Session, write);
             [#mqtt_session{sess_pid = SessPid}] ->
                 mnesia:abort({conflict, SessPid})
         end
@@ -280,7 +282,7 @@ destroy_session(Session = #mqtt_session{client_id = ClientId,
      end.
 
 remove_session(Session) ->
-    case mnesia:transaction(fun mnesia:delete_object/3, [session, Session, write]) of
+    case mnesia:transaction(fun mnesia:delete_object/1, [Session]) of
         {atomic, ok}     -> ok;
         {aborted, Error} -> {error, Error}
     end.
diff --git a/src/emqttd_sm_helper.erl b/src/emqttd_sm_helper.erl
index 184f2be64..aa6a7e365 100644
--- a/src/emqttd_sm_helper.erl
+++ b/src/emqttd_sm_helper.erl
@@ -54,10 +54,9 @@ handle_info({mnesia_system_event, {mnesia_down, Node}}, State) ->
     lager:error("!!!Mnesia node down: ~s", [Node]),
     Fun = fun() ->
             ClientIds =
-            mnesia:select(session, [{#mqtt_session{client_id = '$1', sess_pid = '$2', _ = '_'},
-                                    [{'==', {node, '$2'}, Node}],
-                                    ['$1']}]),
-            lists:foreach(fun(ClientId) -> mnesia:delete({session, ClientId}) end, ClientIds)
+            mnesia:select(mqtt_session, [{#mqtt_session{client_id = '$1', sess_pid = '$2', _ = '_'},
+                                         [{'==', {node, '$2'}, Node}], ['$1']}]),
+            lists:foreach(fun(ClientId) -> mnesia:delete({mqtt_session, ClientId}) end, ClientIds)
           end,
     mnesia:async_dirty(Fun),
     {noreply, State};