Improve audio file naming scheme