Changed some namings of mapping parameters