miscellanious fixes for class and package names