some refactor. on review
IDEA-71247 Overlapping mnemonics
IDEA-102685 Idea doesnt locate sources for snaphot builds via Maven