Change package names from plural to singular.