Refactor names and filenames to be more consistent