Updated names and strings