diff --git a/plugins/provisioners/docker/docker_client.rb b/plugins/provisioners/docker/client.rb
similarity index 99%
rename from plugins/provisioners/docker/docker_client.rb
rename to plugins/provisioners/docker/client.rb
index 7affc7c3a..b916dc948 100644
--- a/plugins/provisioners/docker/docker_client.rb
+++ b/plugins/provisioners/docker/client.rb
@@ -2,7 +2,7 @@ require 'digest/sha1'
 
 module VagrantPlugins
   module Docker
-    class DockerClient
+    class Client
       def initialize(machine)
         @machine = machine
       end
diff --git a/plugins/provisioners/docker/docker_installer.rb b/plugins/provisioners/docker/installer.rb
similarity index 97%
rename from plugins/provisioners/docker/docker_installer.rb
rename to plugins/provisioners/docker/installer.rb
index 7a1a0da14..f6f66e2cf 100644
--- a/plugins/provisioners/docker/docker_installer.rb
+++ b/plugins/provisioners/docker/installer.rb
@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Docker
-    class DockerInstaller
+    class Installer
       def initialize(machine, version)
         @machine = machine
         @version = version
diff --git a/plugins/provisioners/docker/provisioner.rb b/plugins/provisioners/docker/provisioner.rb
index eac195b22..1a3e193aa 100644
--- a/plugins/provisioners/docker/provisioner.rb
+++ b/plugins/provisioners/docker/provisioner.rb
@@ -1,5 +1,5 @@
-require_relative "docker_client"
-require_relative "docker_installer"
+require_relative "client"
+require_relative "installer"
 
 module VagrantPlugins
   module Docker
@@ -13,9 +13,8 @@ module VagrantPlugins
       def initialize(machine, config, installer = nil, client = nil)
         super(machine, config)
 
-        # TODO: Rename to installer / client (drop docker suffix)
-        @installer = installer || DockerInstaller.new(@machine, config.version)
-        @client    = client    || DockerClient.new(@machine)
+        @installer = installer || Installer.new(@machine, config.version)
+        @client    = client    || Client.new(@machine)
       end
 
       def provision