Renaming a couple of functions