AAI:more dedup, unify written file names