Fixing package names.