More consistent method names and some grammar fixes