Changed some method names.