Refactored some names of files and functions