Make the file naming a bit more consistent.