AGP-420: allow hyphen and underscore in aliases