Changed some of the method names to be more obj-c-like.