IMO, we should keep the short names consistent and not trying to retrofit class name refactorings. Under Java 9 rules, we'd have issues if two different artifacts out there would share same package name. So, I'd rather avoid that.