Continuing to fix naming errors caused by noun ending in 's'