3 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 12dc7b3a48..55f4798892 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3387,7 +3387,7 @@ BIF_RETTYPE universaltime_to_localtime_1(BIF_ALIST_1)
 
 /* convert calendar:universaltime_to_seconds/1 */
 
-BIF_RETTYPE universaltime_to_seconds_1(BIF_ALIST_1)
+BIF_RETTYPE universaltime_to_posixtime_1(BIF_ALIST_1)
 {
     Sint year, month, day;
     Sint hour, minute, second;
@@ -3411,7 +3411,7 @@ BIF_RETTYPE universaltime_to_seconds_1(BIF_ALIST_1)
 
 /* convert calendar:seconds_to_universaltime/1 */
 
-BIF_RETTYPE seconds_to_universaltime_1(BIF_ALIST_1)
+BIF_RETTYPE posixtime_to_universaltime_1(BIF_ALIST_1)
 {
     Sint year, month, day;
     Sint hour, minute, second;
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 0d6af46aa5..8cc568b16c 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -810,8 +810,8 @@ bif erlang:check_old_code/1
 #
 # New in R15B
 #
-bif erlang:universaltime_to_seconds/1
-bif erlang:seconds_to_universaltime/1
+bif erlang:universaltime_to_posixtime/1
+bif erlang:posixtime_to_universaltime/1
 #
 # Obsolete
 #
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index b8e2cf51d2..4d12e3449c 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -172,7 +172,7 @@ univ_to_seconds(Config) when is_list(Config) ->
 
 test_univ_to_seconds([{Datetime, Seconds}|DSs]) ->
     io:format("universaltime = ~p -> seconds = ~p", [Datetime, Seconds]),
-    Seconds = erlang:universaltime_to_seconds(Datetime),
+    Seconds = erlang:universaltime_to_posixtime(Datetime),
     test_univ_to_seconds(DSs);
 test_univ_to_seconds([]) -> 
     ok.
@@ -183,7 +183,7 @@ seconds_to_univ(Config) when is_list(Config) ->
 
 test_seconds_to_univ([{Datetime, Seconds}|DSs]) ->
     io:format("universaltime = ~p <- seconds = ~p", [Datetime, Seconds]),
-    Datetime = erlang:seconds_to_universaltime(Seconds),
+    Datetime = erlang:posixtime_to_universaltime(Seconds),
     test_seconds_to_univ(DSs);
 test_seconds_to_univ([]) -> 
     ok.