Made item naming more coherent and efficient