updated command names, template files, and generator tags