Rename item to items. For #1844