updated some namings