fixed some namings