include names in model generator warning message. refs #13515.

This is a follow up to #13515. It includes the name given and
the singularized version in the warning message. This will aide the user
to see wether the detected singular was right or not.
build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81