Use plural in package names