Refactor template aliases to strict aliases