Fix project and package names to be sensible