diff --git a/src/emqttd_alarm.erl b/src/emqttd_alarm.erl
index 1ff4a5ae9..9e7404100 100644
--- a/src/emqttd_alarm.erl
+++ b/src/emqttd_alarm.erl
@@ -90,12 +90,12 @@ handle_event({set_alarm, Alarm = #mqtt_alarm{id       = AlarmId,
                               {severity, Severity},
                               {title, iolist_to_binary(Title)},
                               {summary, iolist_to_binary(Summary)},
-                              {ts, emqttd_time:now_to_secs(Timestamp)}]),
+                              {ts, emqttd_time:now_secs(Timestamp)}]),
     emqttd:publish(alarm_msg(alert, AlarmId, Json)),
     {ok, [Alarm#mqtt_alarm{timestamp = Timestamp} | Alarms]};
 
 handle_event({clear_alarm, AlarmId}, Alarms) ->
-    Json = mochijson2:encode([{id, AlarmId}, {ts, emqttd_time:now_to_secs()}]),
+    Json = mochijson2:encode([{id, AlarmId}, {ts, emqttd_time:now_secs()}]),
     emqttd:publish(alarm_msg(clear, AlarmId, Json)),
     {ok, lists:keydelete(AlarmId, 2, Alarms), hibernate};
 
diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl
index 085032b24..5e49d61c6 100644
--- a/src/emqttd_cli.erl
+++ b/src/emqttd_cli.erl
@@ -503,7 +503,7 @@ print(#mqtt_client{client_id = ClientId, clean_sess = CleanSess, username = User
                    peername = Peername, connected_at = ConnectedAt}) ->
     ?PRINT("Client(~s, clean_sess=~s, username=~s, peername=~s, connected_at=~p)~n",
            [ClientId, CleanSess, Username, emqttd_net:format(Peername),
-            emqttd_time:now_to_secs(ConnectedAt)]);
+            emqttd_time:now_secs(ConnectedAt)]);
 
 %% print(#mqtt_topic{topic = Topic, flags = Flags}) ->
 %%    ?PRINT("~s: ~s~n", [Topic, string:join([atom_to_list(F) || F <- Flags], ",")]);
@@ -542,7 +542,7 @@ print(subscription, {Sub, Topic}) ->
     ?PRINT("~s -> ~s~n", [Sub, Topic]).
 
 format(created_at, Val) ->
-    emqttd_time:now_to_secs(Val);
+    emqttd_time:now_secs(Val);
 
 format(_, Val) ->
     Val.
diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl
index ec4a02479..0fa3237c6 100644
--- a/src/emqttd_message.erl
+++ b/src/emqttd_message.erl
@@ -42,7 +42,7 @@ make(From, Qos, Topic, Payload) ->
                   qos       = ?QOS_I(Qos),
                   topic     = Topic,
                   payload   = Payload,
-                  timestamp = emqttd_time:now_to_secs()}.
+                  timestamp = emqttd_time:now_secs()}.
 
 %% @doc Message from Packet
 -spec(from_packet(mqtt_packet()) -> mqtt_message()).
@@ -60,7 +60,7 @@ from_packet(#mqtt_packet{header   = #mqtt_packet_header{type   = ?PUBLISH,
                   dup       = Dup,
                   topic     = Topic,
                   payload   = Payload,
-                  timestamp = emqttd_time:now_to_secs()};
+                  timestamp = emqttd_time:now_secs()};
 
 from_packet(#mqtt_packet_connect{will_flag  = false}) ->
     undefined;
@@ -78,7 +78,7 @@ from_packet(#mqtt_packet_connect{client_id   = ClientId,
                   qos       = Qos,
                   dup       = false,
                   payload   = Msg, 
-                  timestamp = emqttd_time:now_to_secs()}.
+                  timestamp = emqttd_time:now_secs()}.
 
 from_packet(ClientId, Packet) ->
     Msg = from_packet(Packet),
diff --git a/test/emqttd_lib_SUITE.erl b/test/emqttd_lib_SUITE.erl
index e51e778f0..d4d44cb82 100644
--- a/test/emqttd_lib_SUITE.erl
+++ b/test/emqttd_lib_SUITE.erl
@@ -141,8 +141,8 @@ priority_queue_out2(_) ->
 
 time_now_to_(_) ->
     emqttd_time:seed(),
-    emqttd_time:now_to_secs(),
-    emqttd_time:now_to_ms().
+    emqttd_time:now_secs(),
+    emqttd_time:now_ms().
 
 %%--------------------------------------------------------------------
 %% emqttd_node