Update package names

Update package names to plural and singular depending on contents.