Fix item naming in data generation