Fix filenames and loading function