Changed some method name