diff --git a/internal/plugin/factory.go b/internal/plugin/factory.go
index 5d06d8eeb..ddfe9536b 100644
--- a/internal/plugin/factory.go
+++ b/internal/plugin/factory.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	//	"strings"
+	"strings"
 
 	"github.com/hashicorp/go-argmapper"
 	"github.com/hashicorp/go-hclog"
@@ -35,9 +35,12 @@ func Factory(
 		// fields on it.
 		cmdCopy := *cmd
 
-		config := pluginclient.ClientConfig(log)
+		log = log.Named("factory")
+
+		nlog := log.ResetNamed("vagrant.plugin")
+		config := pluginclient.ClientConfig(nlog)
 		config.Cmd = &cmdCopy
-		config.Logger = log
+		config.Logger = nlog
 
 		// Log that we're going to launch this
 		log.Info("launching plugin",
@@ -87,7 +90,7 @@ func Factory(
 			Name:       info.Name(),
 			Types:      info.ComponentTypes(),
 			components: map[component.Type]*Instance{},
-			logger:     log,
+			logger:     nlog.Named(info.Name()),
 			src:        client,
 		}
 
@@ -135,7 +138,7 @@ func RubyFactory(
 			Name:       name,
 			Types:      []component.Type{typ},
 			components: map[component.Type]*Instance{},
-			logger:     log,
+			logger:     log.ResetNamed("vagrant.legacy." + strings.ToLower(typ.String())),
 		}, nil
 	}
 }
diff --git a/internal/plugin/manager.go b/internal/plugin/manager.go
index fe9259c4b..3963d7af2 100644
--- a/internal/plugin/manager.go
+++ b/internal/plugin/manager.go
@@ -332,7 +332,7 @@ func (m *Manager) loadInProcessBuiltins() (err error) {
 func (m *Manager) register(
 	factory PluginRegistration, // Function to generate plugin
 ) (err error) {
-	plg, err := factory(m.logger)
+	plg, err := factory(m.logger.ResetNamed("vagrant.plugin"))
 	if err != nil {
 		return
 	}
diff --git a/internal/serverclient/client.go b/internal/serverclient/client.go
index c1d4838ed..4905c43be 100644
--- a/internal/serverclient/client.go
+++ b/internal/serverclient/client.go
@@ -23,7 +23,7 @@ type VagrantClient struct {
 }
 
 func NewVagrantClient(ctx context.Context, log hclog.Logger, addr string) (*VagrantClient, error) {
-	log = log.Named("vagrant-client")
+	log = log.Named("vagrant.client")
 	conn, err := Connect(ctx,
 		WithAddr(addr),
 	)
diff --git a/internal/serverclient/ruby_client.go b/internal/serverclient/ruby_client.go
index 40e952f48..57ae49724 100644
--- a/internal/serverclient/ruby_client.go
+++ b/internal/serverclient/ruby_client.go
@@ -33,7 +33,7 @@ type RubyVagrantClient struct {
 }
 
 func RubyVagrantPluginConfig(log hclog.Logger) *plugin.ClientConfig {
-	log = log.ResetNamed("vagrant.client.ruby-runtime")
+	log = log.ResetNamed("vagrant.legacy")
 	config := pluginclient.ClientConfig(log)
 	config.Logger = log
 	config.VersionedPlugins[1]["vagrantrubyruntime"] = &RubyVagrantPlugin{}