Change to a deterministic filename scheme