diff --git a/src/gen_emm.erl b/src/gen_emm.erl
index 5b92d03..e8f8358 100644
--- a/src/gen_emm.erl
+++ b/src/gen_emm.erl
@@ -246,7 +246,7 @@ which_epm(EpmSrv) ->
 
 -spec info_notify(serverRef(), term()) -> 'ok'.
 info_notify(EpmSrv, Event) ->
-   epmRequest(EpmSrv, {'$gen_info', '$infoNotify', Event}).
+   epmRequest(EpmSrv, {'$epm_info', '$infoNotify', Event}).
 
 -spec call_notify(serverRef(), term()) -> 'ok'.
 call_notify(EpmSrv, Event) ->
@@ -261,11 +261,11 @@ call(EpmSrv, EpmHandler, Query, Timeout) ->
    epmRpc(EpmSrv, {'$epmCall', EpmHandler, Query}, Timeout).
 
 send(EpmSrv, EpmHandler, Msg) ->
-   epmRequest(EpmSrv, {'$gen_info', EpmHandler, Msg}).
+   epmRequest(EpmSrv, {'$epm_info', EpmHandler, Msg}).
 
 -spec send_request(serverRef(), epmHandler(), term()) -> requestId().
 send_request(EpmSrv, EpmHandler, Query) ->
-   gen:send_request(EpmSrv, '$gen_call', {'$epmCall', EpmHandler, Query}).
+   gen:send_request(EpmSrv, '$epm_call', {'$epmCall', EpmHandler, Query}).
 
 -spec wait_response(RequestId :: requestId(), timeout()) ->
    {reply, Reply :: term()} | 'timeout' | {error, {Reason :: term(), serverRef()}}.
@@ -284,7 +284,7 @@ check_response(Msg, RequestId) ->
    end.
 
 epmRpc(EpmSrv, Cmd) ->
-   try gen:call(EpmSrv, '$gen_call', Cmd, infinity) of
+   try gen:call(EpmSrv, '$epm_call', Cmd, infinity) of
       {ok, Reply} ->
          Reply
    catch Class:Reason ->
@@ -292,7 +292,7 @@ epmRpc(EpmSrv, Cmd) ->
    end.
 
 epmRpc(EpmSrv, Cmd, Timeout) ->
-   try gen:call(EpmSrv, '$gen_call', Cmd, Timeout) of
+   try gen:call(EpmSrv, '$epm_call', Cmd, Timeout) of
       {ok, Reply} ->
          Reply
    catch Class:Reason ->
@@ -398,7 +398,7 @@ handleMsg(Parent, ServerName, HibernateAfterTimeout, EpmHers, Debug, Msg) ->
          NewEpmHers = epmStopOne(EpmHers, From, Reason),
          receiveIng(Parent, ServerName, HibernateAfterTimeout, NewEpmHers, NewDebug, false);
       {_From, Tag, stop} ->
-         try terminate_server(normal, Parent, EpmHers, ServerName)
+         try terminate_server(normal, Parent, ServerName, EpmHers)
          after
             reply(Tag, ok)
          end;