Change aliases to templates