Made the file naming more consistent