Changed the package names to be plural