Added \b's to the name replacer regex