Improved scaffold templates and name validation