Rename a couple methods to fit guideline