corrected some namings, according to conventions