Merge pull request #12338 from JuanitoFatas/generator

[ci skip] Update scaffold output and change some words.