Add the change in name variations
Some improvements on the wordings