Upgrade java class names and paths