Harmonized function names and filenames