diff --git a/cmd/prototype.go b/cmd/prototype.go
index 11cd1a5292b204814b2afbcd6bd5d2c526b9381b..eb629ba9de0ce07a69f8f258ebc785effb579bc4 100644
--- a/cmd/prototype.go
+++ b/cmd/prototype.go
@@ -388,6 +388,15 @@ var prototypeUseCmd = &cobra.Command{
 			return fmt.Errorf("Command has too many arguments (takes a prototype name and a component name)\n\n%s", cmd.UsageString())
 		}
 
+		name, err := flags.GetString("name")
+		if err != nil {
+			return err
+		}
+
+		if name == "" {
+			flags.Set("name", componentName)
+		}
+
 		params, err := getParameters(proto, flags)
 		if err != nil {
 			return err