fixing some namings