Change package name to plural