Changed some method and field names