Updated some namings to make it smaller in the views