@@ -166,14 +166,14 @@ type Options struct {

 // if scanning prior drivers is ambiguous (i.e., if state is found for

 // multiple drivers), or if no compatible driver is available for the

 // platform and underlying filesystem.

-func New(name string, config Options) (Driver, error) {

+func New(driverName string, config Options) (Driver, error) {

 	ctx := context.TODO()

-	if name != "" {

-		log.G(ctx).Infof("[graphdriver] trying configured driver: %s", name)

-		if err := checkRemoved(name); err != nil {

+	if driverName != "" {

+		log.G(ctx).Infof("[graphdriver] trying configured driver: %s", driverName)

+		if err := checkRemoved(driverName); err != nil {

 			return nil, err

 		}

-		return getDriver(name, config)

+		return getDriver(driverName, config)

 	}

 	// Guess for prior driver

@@ -200,8 +200,8 @@ func New(name string, config Options) (Driver, error) {

 			// to ensure the user explicitly selects the driver to load

 			if len(driversMap) > 1 {

 				var driversSlice []string

-				for name := range driversMap {

-					driversSlice = append(driversSlice, name)

+				for d := range driversMap {

+					driversSlice = append(driversSlice, d)

 				}

 				err = errors.Errorf("%s contains several valid graphdrivers: %s; cleanup or explicitly choose storage driver (-s <DRIVER>)", config.Root, strings.Join(driversSlice, ", "))