Renaming a few functions.