Tweaks to names
Use template file