massive renaming of functions and files to follow new convention