Renaming some methods and files so the code will be more readable