Adjust all the names to the full form.