AGP-420: allow - and _ in alias names; fix tests
AGP-420: fix CS