Rename packages to omit plural cases.