Further improvements on file naming.