renamed packages from plural to singular