Updated all the things with shorter naming method