Refactored code and files to proper names