Improving key file naming