changed filenames, optimized attribute changes