I was initially going to suggest doing this in #3086081: Name of composer:sca...

I was initially going to suggest doing this in #3086081: Name of composer:scaffold command is awkward itself, but then I saw the number of files we have to change. I think a separate issue makes sense. Here's the first attempt.

Also, the change makes sense and it is better to do it now rather than after 8.8.x release when it will be much more difficult to change.