Refactored file and function names so they make more sense.