Rename a couple of methods and variables