Update namings.