rename client/server "change" -> "event"

3 files changed, 10 insertions, 10 deletions

diff --git a/p11p-daemon/src/p11p_remote.erl b/p11p-daemon/src/p11p_remote.erl
index 12f513d..cb59d20 100644
--- a/p11p-daemon/src/p11p_remote.erl
+++ b/p11p-daemon/src/p11p_remote.erl
@@ -78,7 +78,7 @@ handle_info({Port, {data, Data}}, #state{msg = Msg} = State) when Port == State#
     {noreply, handle_remote_data(State, Msg, Data)};
 handle_info({timeout, Timer, Port}, #state{token = TokName} = State) when Port == State#state.port, Timer == State#state.timer ->
     lager:info("~p: rpc request timed out, exiting", [self()]),
-    ok = p11p_remote_manager:server_change(timeout, [TokName]),
+    ok = p11p_remote_manager:server_event(timeout, [TokName]),
     NewState = State#state{timer = undefined},
     {stop, normal, NewState};
 handle_info(Info, State) ->
diff --git a/p11p-daemon/src/p11p_remote_manager.erl b/p11p-daemon/src/p11p_remote_manager.erl
index be921ee..74f035b 100644
--- a/p11p-daemon/src/p11p_remote_manager.erl
+++ b/p11p-daemon/src/p11p_remote_manager.erl
@@ -24,8 +24,8 @@
 
 %% API.
 -export([start_link/0]).
--export([remote_for_token/1, client_change/2]).	% For servers.
--export([server_change/2]).			% For remotes.
+-export([remote_for_token/1, client_event/2]).	% For servers.
+-export([server_event/2]).			% For remotes.
 
 %% Genserver callbacks.
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
@@ -56,11 +56,11 @@ start_link() ->
 -spec remote_for_token(string()) -> pid().
 remote_for_token(TokName) ->
     gen_server:call(?MODULE, {remote_for_token, TokName}).
-client_change(Change, Args) ->
-    gen_server:call(?MODULE, {client_change, Change, Args}).
+client_event(Change, Args) ->
+    gen_server:call(?MODULE, {client_event, Change, Args}).
 
-server_change(Change, Args) ->
-    gen_server:call(?MODULE, {server_change, Change, Args}).
+server_event(Change, Args) ->
+    gen_server:call(?MODULE, {server_event, Change, Args}).
 
 %% Genserver callbacks.
 init([]) ->
@@ -80,7 +80,7 @@ handle_call({remote_for_token, TokName}, _From, #state{tokens = Tokens} = State)
 	_ ->
 	    {reply, Pid, State}
     end;
-handle_call({server_change, timeout, [TokName]}, _From, #state{tokens = Tokens} = State) ->
+handle_call({server_event, timeout, [TokName]}, _From, #state{tokens = Tokens} = State) ->
     lager:debug("~p: ~s: timed out", [self(), TokName]),
     %% TODO: do some code dedup with remote_for_token?
     #{TokName := Token} = Tokens,
@@ -91,7 +91,7 @@ handle_call({server_change, timeout, [TokName]}, _From, #state{tokens = Tokens}
     NewState = State#state{tokens = Tokens#{TokName := NewToken}},
     lager:debug("~p: ~s: updated token: ~p", [self(), TokName, NewToken]),
     {reply, ok, NewState};
-handle_call({client_change, client_gone, [TokName, Pid]}, From, #state{tokens = Tokens} = State) ->
+handle_call({client_event, client_gone, [TokName, Pid]}, From, #state{tokens = Tokens} = State) ->
     lager:debug("~p: killing off remote ~p on request from ~p", [self(), Pid, From]),
     gen_server:stop(Pid),
     #{TokName := Token} = Tokens,
diff --git a/p11p-daemon/src/p11p_server.erl b/p11p-daemon/src/p11p_server.erl
index f0feec7..733ce6f 100644
--- a/p11p-daemon/src/p11p_server.erl
+++ b/p11p-daemon/src/p11p_server.erl
@@ -96,7 +96,7 @@ handle_info(Info, State) ->
 terminate(_Reason, #state{socket = Socket, tokname = TokName, remote = Remote}) ->
     lager:debug("~p: terminated", [self()]),
     gen_tcp:close(Socket),
-    p11p_remote_manager:client_change(client_gone, [TokName, Remote]),
+    p11p_remote_manager:client_event(client_gone, [TokName, Remote]),
     ok.
 
 code_change(_OldVersion, State, _Extra) ->