Fix for naming in template two
Add part three