align names to the common style