Rename a couple more methods