diff --git a/cmd/pro/create_workspace.go b/cmd/pro/create_workspace.go
index 81d5478b1..0e7d2489b 100644
--- a/cmd/pro/create_workspace.go
+++ b/cmd/pro/create_workspace.go
@@ -23,7 +23,7 @@ type CreateWorkspaceCmd struct {
 	Instance string
 }
 
-// NewListworkspacesCmd creates a new command
+// NewCreateWorkspaceCmd creates a new command
 func NewCreateWorkspaceCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
 	cmd := &CreateWorkspaceCmd{
 		GlobalFlags: globalFlags,
diff --git a/cmd/pro/list_workspaces.go b/cmd/pro/list_workspaces.go
index f3f9fb226..ccc78fb62 100644
--- a/cmd/pro/list_workspaces.go
+++ b/cmd/pro/list_workspaces.go
@@ -22,7 +22,7 @@ type ListWorkspacesCmd struct {
 	Host string
 }
 
-// NewListworkspacesCmd creates a new command
+// NewListWorkspacesCmd creates a new command
 func NewListWorkspacesCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
 	cmd := &ListWorkspacesCmd{
 		GlobalFlags: globalFlags,
diff --git a/cmd/pro/update_provider.go b/cmd/pro/update_provider.go
index c3d33c67c..367fcef0f 100644
--- a/cmd/pro/update_provider.go
+++ b/cmd/pro/update_provider.go
@@ -23,7 +23,7 @@ type UpdateProviderCmd struct {
 	Instance string
 }
 
-// NewListworkspacesCmd creates a new command
+// NewUpdateProviderCmd creates a new command
 func NewUpdateProviderCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
 	cmd := &UpdateProviderCmd{
 		GlobalFlags: globalFlags,
diff --git a/cmd/pro/update_workspace.go b/cmd/pro/update_workspace.go
index 58aacb2d5..85f9ccdca 100644
--- a/cmd/pro/update_workspace.go
+++ b/cmd/pro/update_workspace.go
@@ -23,7 +23,7 @@ type UpdateWorkspaceCmd struct {
 	Instance string
 }
 
-// NewListworkspacesCmd creates a new command
+// NewUpdateWorkspaceCmd creates a new command
 func NewUpdateWorkspaceCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
 	cmd := &UpdateWorkspaceCmd{
 		GlobalFlags: globalFlags,
diff --git a/cmd/provider/options.go b/cmd/provider/options.go
index 6c656a4ff..bd40a12ae 100644
--- a/cmd/provider/options.go
+++ b/cmd/provider/options.go
@@ -132,7 +132,7 @@ func printOptions(devPodConfig *config.Config, provider *workspace.ProviderWithO
 	return nil
 }
 
-// mergeOptions merges the static provider options and dynamic options
+// MergeDynamicOptions merges the static provider options and dynamic options
 func MergeDynamicOptions(options map[string]*types.Option, dynamicOptions config.OptionDefinitions) map[string]*types.Option {
 	retOptions := map[string]*types.Option{}
 	for k, option := range options {
diff --git a/e2e/framework/server_utils.go b/e2e/framework/server_utils.go
index 24e0c16cb..db6e23fc9 100644
--- a/e2e/framework/server_utils.go
+++ b/e2e/framework/server_utils.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 )
 
-// serveAgent will be a simple http file server that will expose our
+// ServeAgent will be a simple http file server that will expose our
 // freshly compiled devpod binaries to be downloaded as agents.
 // useful for non-linux runners
 func ServeAgent() {