renamed packages to plurals