refactor, consistent namings across template files