diff --git a/lib/vagrant/machine/remote.rb b/lib/vagrant/machine/remote.rb
index c5ee6ecd5..55ad5f363 100644
--- a/lib/vagrant/machine/remote.rb
+++ b/lib/vagrant/machine/remote.rb
@@ -131,7 +131,7 @@ module Vagrant
       def communicate
         @logger.debug("Getting communicator from client")
         if !@communicate
-          @communicate = Vagrant::Plugin::V2::Communicator.new(self)
+          @communicate = Vagrant::Plugin::Remote::Communicator.new(self)
         end
         @communicate
       end
@@ -306,7 +306,7 @@ module Vagrant
           next if f[:folder][:disabled]
           # TODO: get type of synced folder
           impl = :virtualbox
-          sf = Vagrant::Plugin::V2::SyncedFolder.new(client: f[:plugin])
+          sf = Vagrant::Plugin::Remote::SyncedFolder.new(client: f[:plugin])
           # Set plugin, guestpath and hostpath from synced folder info
           folders[impl] = {f[:folder][:destination] => f[:folder].merge({
             plugin: sf,
diff --git a/plugins/commands/serve/mappers/synced_folder.rb b/plugins/commands/serve/mappers/synced_folder.rb
index 41e0b2d1a..9bb356584 100644
--- a/plugins/commands/serve/mappers/synced_folder.rb
+++ b/plugins/commands/serve/mappers/synced_folder.rb
@@ -60,7 +60,7 @@ module VagrantPlugins
         end
 
         def converter(client)
-          Vagrant::Plugin::V2::SyncedFolder.new(client: client)
+          Vagrant::Plugin::Remote::SyncedFolder.new(client: client)
         end
       end
     end