Updated names for entities