Change filenames and configuration handling