Unify Activator tags

Unify Activator tags to reduce tag list