naming convention change to singular