Item type and name fix/split