fixed naming conventions for class methods (all camel case now rather than mix of camel and underscores