This isn't elegant
Fix filenames
Fix merge conflict