dynamic file naming improved