Keep package names in singular.