add common-aliases and remove duplication