diff --git a/src/gen_emm.erl b/src/gen_emm.erl
index c78bcfe..54530b5 100644
--- a/src/gen_emm.erl
+++ b/src/gen_emm.erl
@@ -123,8 +123,8 @@
 -callback handleEvent(Event :: term(), State :: term()) ->
    kpS |
    removeEpm |
-   {ok, NewState :: term()} |
-   {ok, NewState :: term(), hibernate} |
+   {noreply, NewState :: term()} |
+   {noreply, NewState :: term(), hibernate} |
    {swapEpm, NewState :: term(), Args1 :: term(), NewHandler :: epmHandler(), Args2 :: term()}.
 
 -callback handleCall(Request :: term(), State :: term()) ->
@@ -137,8 +137,8 @@
 -callback handleInfo(Info :: term(), State :: term()) ->
    kpS |
    removeEpm |
-   {ok, NewState :: term()} |
-   {ok, NewState :: term(), hibernate} |
+   {noreply, NewState :: term()} |
+   {noreply, NewState :: term(), hibernate} |
    {swapEpm, NewState :: term(), Args1 :: term(), NewHandler :: epmHandler(), Args2 :: term()}.
 
 -callback terminate(Args :: terminateArgs(), State :: term()) ->
@@ -551,10 +551,10 @@ handleEpmCR(Result, EpmHers, EpmId, EpmHer, Event, From) ->
    case Result of
       kpS ->
          EpmHers;
-      {ok, NewEpmS} ->
+      {noreply, NewEpmS} ->
          MewEpmHer = setelement(#epmHer.epmS, EpmHer, NewEpmS),
          EpmHers#{EpmId := MewEpmHer};
-      {ok, NewEpmS, hibernate} ->
+      {noreply, NewEpmS, hibernate} ->
          MewEpmHer = setelement(#epmHer.epmS, EpmHer, NewEpmS),
          {EpmHers#{EpmId := MewEpmHer}, true};
       {swapEpm, NewEpmS, Args1, EpmMId, Args2} ->
diff --git a/src/gen_epm.erl b/src/gen_epm.erl
index 275f5fd..d44ded3 100644
--- a/src/gen_epm.erl
+++ b/src/gen_epm.erl
@@ -16,8 +16,8 @@
 -callback handleEvent(Event :: term(), State :: term()) ->
    kpS |
    removeEpm |
-   {ok, NewState :: term()} |
-   {ok, NewState :: term(), hibernate} |
+   {noreply, NewState :: term()} |
+   {noreply, NewState :: term(), hibernate} |
    {swapEpm, NewState :: term(), Args1 :: term(), NewHandler :: gen_ipc:epmHandler(), Args2 :: term()}.
 
 -callback handleCall(Request :: term(), State :: term()) ->
@@ -30,8 +30,8 @@
 -callback handleInfo(Info :: term(), State :: term()) ->
    kpS |
    removeEpm |
-   {ok, NewState :: term()} |
-   {ok, NewState :: term(), hibernate} |
+   {noreply, NewState :: term()} |
+   {noreply, NewState :: term(), hibernate} |
    {swapEpm, NewState :: term(), Args1 :: term(), NewHandler :: gen_ipc:epmHandler(), Args2 :: term()}.
 
 -callback terminate(Args :: terminateArgs(), State :: term()) -> term().
diff --git a/src/gen_ipc.erl b/src/gen_ipc.erl
index a7e1314..75bec08 100644
--- a/src/gen_ipc.erl
+++ b/src/gen_ipc.erl
@@ -1349,10 +1349,10 @@ handleEpmCR(Result, EpmHers, #epmHer{epmId = EpmId} = EpmHer, Event, From) ->
    case Result of
       kpS ->
          {EpmHers, false};
-      {ok, NewEpmS} ->
+      {noreply, NewEpmS} ->
          MewEpmHer = setelement(#epmHer.epmS, EpmHer, NewEpmS),
          {EpmHers#{EpmId := MewEpmHer}, false};
-      {ok, NewEpmS, hibernate} ->
+      {noreply, NewEpmS, hibernate} ->
          MewEpmHer = setelement(#epmHer.epmS, EpmHer, NewEpmS),
          {EpmHers#{EpmId := MewEpmHer}, true};
       {swapEpm, NewEpmS, Args1, EpmMId, Args2} ->