metamer: added more aliases to some templates, refactored to use Set