rename files to match naming convensions