Changed some of the ITEM_* defines.