diff --git a/internal/core/machine.go b/internal/core/machine.go
index ae638e77e..a19e1be1e 100644
--- a/internal/core/machine.go
+++ b/internal/core/machine.go
@@ -160,6 +160,12 @@ func (m *Machine) Guest() (g core.Guest, err error) {
 	// TODO(spox): Fix this in the plugin manager
 	m.seedPlugin(result)
 	m.guest = result
+	if named, ok := result.(core.Named); ok {
+		named.SetPluginName(result_name)
+		if err != nil {
+			return nil, err
+		}
+	}
 	g = result
 	return result, nil
 }
diff --git a/lib/vagrant/guest/remote.rb b/lib/vagrant/guest/remote.rb
index 65103294a..749f0a32b 100644
--- a/lib/vagrant/guest/remote.rb
+++ b/lib/vagrant/guest/remote.rb
@@ -38,8 +38,6 @@ module Vagrant
       #
       # @param [Symbol] cap_name Name of the capability
       def capability(cap_name, *args)
-        @logger.debug("running name just 'cause:")
-        @logger.debug("neam is: #{name}")
         @logger.debug("running remote guest capability #{cap_name} with args #{args}")
         if !client.has_capability?(cap_name)
           raise Errors::GuestCapabilityNotFound,
diff --git a/plugins/commands/serve/client/guest.rb b/plugins/commands/serve/client/guest.rb
index 0cc946eb7..ae10e608d 100644
--- a/plugins/commands/serve/client/guest.rb
+++ b/plugins/commands/serve/client/guest.rb
@@ -23,7 +23,7 @@ module VagrantPlugins
 
         # @return [String] plugin name
         def name
-          c = client.name(Empty.new)
+          c = client.plugin_name(Empty.new)
           c.name
         end
       end
diff --git a/plugins/commands/serve/service/guest_service.rb b/plugins/commands/serve/service/guest_service.rb
index 4337105e9..4d07c95b2 100644
--- a/plugins/commands/serve/service/guest_service.rb
+++ b/plugins/commands/serve/service/guest_service.rb
@@ -83,6 +83,20 @@ module VagrantPlugins
           end
         end
 
+        def set_plugin_name(req, ctx)
+          logger.debug("setting plugin name to nothing 'cause i don't care")
+          Empty.new
+        end
+
+        def plugin_name(req, ctx)
+          with_info(ctx, broker: broker) do |info|
+            logger.debug("returning plugin name #{info.plugin_name}")
+            SDK::PluginInfo::Name.new(
+              name: info.plugin_name
+            )
+          end
+        end
+
         def capability_arguments(args)
           target, direct = args
           nargs = direct.args.dup