finished renaming bad method names. Closes #35