Changed method names

Some method names changed to reflect better names for methods after
restructuring the codebase.