Refactored file, object and method names