Changed strings and added name list