Method name consistency

We currently have two different method naming styles: mine, and the rest of the project (I didn't think about this when I wrote my code). They should be made consistent.