Changed naming for some methods