Did some renaming of functions.