Make class and package naming more consistent