Fix typos and naming

modules/yarpc/yarpc.go

@@ -254,7 +254,7 @@ func (c *dispatcherController) Start(host service.Host, statsClient *statsClient
 
 		var cfg yarpc.Config
 		var err error
-		if cfg, err = c.createConfig(host.Name()); err != nil {
+		if cfg, err = c.mergeConfig(host.Name()); err != nil {
 			c.startError = err
 			return
 		}
@@ -336,9 +336,8 @@ func (c *dispatcherController) addDefaultMiddleware(host service.Host, statsClie
 	c.addConfig(cfg)
 }
 
-// Create the YARPC config : transports and middleware are going to be shared.
-// The name comes from the first config in the collection and is the same among all configs.
-func (c *dispatcherController) createConfig(advertiseName string) (conf yarpc.Config, err error) {
+// Merge all YARPC config in the controller with the service name and middleware
+func (c *dispatcherController) mergeConfig(advertiseName string) (conf yarpc.Config, err error) {
 	c.RLock()
 	defer c.RUnlock()
 

modules/yarpc/yarpc_test.go

@@ -121,7 +121,7 @@ func TestBindToBadPortReturnsError(t *testing.T) {
 func TestMergeOfEmptyConfigCollectionReturnsError(t *testing.T) {
 	t.Parallel()
 	c := dispatcherController{}
-	_, err := c.createConfig("test")
+	_, err := c.mergeConfig("test")
 	assert.EqualError(t, err, "unable to merge empty configs")
 	host := service.NopHost()
 	assert.EqualError(t, c.Start(host, newStatsClient(host.Metrics())), err.Error())

service/manager.go

@@ -385,25 +385,29 @@ func (m *manager) startModules() []error {
 	// calls to return
 	wg.Add(len(m.moduleWrappers))
 	for _, mod := range m.moduleWrappers {
-		go func(modWrapper *moduleWrapper) {
-			if !modWrapper.IsRunning() {
+		go func(mw *moduleWrapper) {
+			if !mw.IsRunning() {
 				errC := make(chan error, 1)
-				go func() { errC <- modWrapper.Start() }()
+				go func() { errC <- mw.Start() }()
 				select {
 				case err := <-errC:
 					if err != nil {
-						zap.L().Error("Error received while starting module", zap.String("module", modWrapper.Name()), zap.Error(err))
+						zap.L().Error(
+							"Error received while starting module",
+							zap.String("module", mw.Name()),
+							zap.Error(err),
+						)
 						lock.Lock()
 						results = append(results, err)
 						lock.Unlock()
 					} else {
-						zap.L().Info("Module started up cleanly", zap.String("module", modWrapper.Name()))
+						zap.L().Info("Module started up cleanly", zap.String("module", mw.Name()))
 					}
 				case <-time.After(defaultStartupWait):
 					lock.Lock()
 					results = append(
 						results,
-						fmt.Errorf("module: %s didn't start after %v", modWrapper.Name(), defaultStartupWait),
+						fmt.Errorf("module: %s didn't start after %v", mw.Name(), defaultStartupWait),
 					)
 					lock.Unlock()
 				}

service/module.go

@@ -27,7 +27,7 @@ import (
 
 // ModuleProvider provides Modules.
 type ModuleProvider interface {
-	// DefaultName returns the module name
+	// DefaultName returns the default module name
 	DefaultName() string
 	// Create a new Module. The name of the Host and the scoping
 	// of associated functions on the Host will be done using a name