Fixed item referencing and naming conventions.