Rename a couple methods