Improve naming of file and function