Fix names
Clean up bundle-class-path calculation