Fix filenames and build script