Fixed weird namings.