change the name to singular ones