Fixed some namings