20140903 change aliases and add template