Changed some medthod names