Tweaks to names to align with template generation