diff --git a/apps/efka/src/efka_micro_service.erl b/apps/efka/src/efka_micro_service.erl
index 2e3b6c8..b4ba9fd 100644
--- a/apps/efka/src/efka_micro_service.erl
+++ b/apps/efka/src/efka_micro_service.erl
@@ -14,7 +14,7 @@
 
 %% API
 -export([start_link/2]).
--export([get_name/1]).
+-export([get_name/1, start_service/1, stop_service/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@@ -35,11 +35,11 @@
 get_name(ServerId) when is_binary(ServerId) ->
     list_to_atom("efka_server:" ++ binary_to_list(ServerId)).
 
-start_server(Pid) when is_pid(Pid) ->
-    gen_server:call(Pid, start_server).
+start_service(Pid) when is_pid(Pid) ->
+    gen_server:call(Pid, start_service).
 
-stop_server(Pid) when is_pid(Pid) ->
-    gen_server:call(Pid, stop_server).
+stop_service(Pid) when is_pid(Pid) ->
+    gen_server:call(Pid, stop_service).
 
 %% @doc Spawns the server and registers the local name (unique)
 -spec(start_link(Name :: atom(), ServerId :: binary()) ->
diff --git a/apps/efka/src/efka_sup.erl b/apps/efka/src/efka_sup.erl
index dbd6f83..e9c6a70 100644
--- a/apps/efka/src/efka_sup.erl
+++ b/apps/efka/src/efka_sup.erl
@@ -57,11 +57,11 @@ init([]) ->
 
         #{
             id => 'efka_server_sup',
-            start => {'efka_server_sup', start_link, []},
+            start => {'efka_micro_service_sup', start_link, []},
             restart => permanent,
             shutdown => 2000,
             type => supervisor,
-            modules => ['efka_server_sup']
+            modules => ['efka_micro_service_sup']
         }
     ],
     {ok, {SupFlags, ChildSpecs}}.