Updated names as requested by client