Minor tweaks to ItemNames