diff --git a/src/host/iot_container_request_builder.erl b/src/docker/docker_container_builder.erl
similarity index 99%
rename from src/host/iot_container_request_builder.erl
rename to src/docker/docker_container_builder.erl
index ed568c7..85d2a78 100644
--- a/src/host/iot_container_request_builder.erl
+++ b/src/docker/docker_container_builder.erl
@@ -5,7 +5,7 @@
 %%% ContainerRequest protobuf builder helpers.
 %%% @end
 %%%-------------------------------------------------------------------
--module(iot_container_request_builder).
+-module(docker_container_builder).
 
 -include("message_pb.hrl").
 
diff --git a/src/host/iot_host.erl b/src/host/iot_host.erl
index 41903b7..6661b87 100644
--- a/src/host/iot_host.erl
+++ b/src/host/iot_host.erl
@@ -96,15 +96,15 @@ attach_channel(Pid, ChannelPid) when is_pid(Pid), is_pid(ChannelPid) ->
 
 -spec get_containers(Pid :: pid()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 get_containers(Pid) when is_pid(Pid) ->
-    container_call(Pid, iot_container_request_builder:list_request()).
+    container_call(Pid, docker_container_builder:list_request()).
 
 -spec config_container(Pid :: pid(), ContainerName :: binary(), ConfigJson :: binary()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 config_container(Pid, ContainerName, ConfigJson) when is_pid(Pid), is_binary(ContainerName), is_binary(ConfigJson) ->
-    container_call(Pid, iot_container_request_builder:config_request(ContainerName, ConfigJson)).
+    container_call(Pid, docker_container_builder:config_request(ContainerName, ConfigJson)).
 
 -spec deploy_container(Pid :: pid(), TaskId :: integer(), Config :: map()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 deploy_container(Pid, TaskId, Config) when is_pid(Pid), is_integer(TaskId), is_map(Config) ->
-    case iot_container_request_builder:deploy_request(TaskId, Config) of
+    case docker_container_builder:deploy_request(TaskId, Config) of
         {ok, Request} ->
             container_call(Pid, Request);
         {error, Reason} ->
@@ -113,19 +113,19 @@ deploy_container(Pid, TaskId, Config) when is_pid(Pid), is_integer(TaskId), is_m
 
 -spec start_container(Pid :: pid(), ContainerName :: binary()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 start_container(Pid, ContainerName) when is_pid(Pid), is_binary(ContainerName) ->
-    container_call(Pid, iot_container_request_builder:start_request(ContainerName)).
+    container_call(Pid, docker_container_builder:start_request(ContainerName)).
 
 -spec stop_container(Pid :: pid(), ContainerName :: binary()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 stop_container(Pid, ContainerName) when is_pid(Pid), is_binary(ContainerName) ->
-    container_call(Pid, iot_container_request_builder:stop_request(ContainerName)).
+    container_call(Pid, docker_container_builder:stop_request(ContainerName)).
 
 -spec kill_container(Pid :: pid(), ContainerName :: binary()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 kill_container(Pid, ContainerName) when is_pid(Pid), is_binary(ContainerName) ->
-    container_call(Pid, iot_container_request_builder:kill_request(ContainerName)).
+    container_call(Pid, docker_container_builder:kill_request(ContainerName)).
 
 -spec remove_container(Pid :: pid(), ContainerName :: binary()) -> {ok, Ref :: reference()} | {error, Reason :: any()}.
 remove_container(Pid, ContainerName) when is_pid(Pid), is_binary(ContainerName) ->
-    container_call(Pid, iot_container_request_builder:remove_request(ContainerName)).
+    container_call(Pid, docker_container_builder:remove_request(ContainerName)).
 
 -spec await_reply(Pid :: pid(), Ref :: reference(), Timeout :: integer()) ->
     {ok, Result :: binary()} | {error, Code :: integer(), Reason :: binary()}.