Component generator singularizes name

[mcavaliere]

See below image. I asked for "buttons" and got "button" :) If this is by design, a warning (with an override flag) might be a good idea.