Fix some filenames + cosmetic