rename some methods that got missed
continuing work on refactor, inconsistent state