Fixing the name of classes in plural to singular form.