Working on proper renaming of functions