Improved SimpleMusicFileNameGenerator