Changed name handling of Items