Further cleans up package names