diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py
index 99b681b221..64eb545a0f 100755
--- a/packager/app/test/packager_test.py
+++ b/packager/app/test/packager_test.py
@@ -142,13 +142,13 @@ class PackagerAppTest(unittest.TestCase):
       output_file = '%s_%s' % (self.output_prefix, descriptor)
     else:
       str_params = (self.output_prefix, test_file_index, descriptor)
-      output_file = '%s_%d_%s' % str_params
+      output_file = '%s_%d-%s' % str_params
 
     if trick_play_factor:
-      output_file += '_trick_play_factor_%d' % trick_play_factor
+      output_file += '-trick_play_factor_%d' % trick_play_factor
 
     if skip_encryption:
-      output_file += '_skip_encryption'
+      output_file += '-skip_encryption'
 
     stream = StreamDescriptor(test_file)
     stream.Append('stream', descriptor)
diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd
index 47002fcf88..423fb2e3eb 100644
--- a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd
+++ b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd
@@ -13,7 +13,7 @@
     <AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/30030" subsegmentAlignment="true" par="16:9">
       <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
       <Representation id="1" bandwidth="156160" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false">
-        <BaseURL>output_video_trick_play_factor_1.mp4</BaseURL>
+        <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
         <SegmentBase indexRange="823-890" timescale="30000">
           <Initialization range="0-822"/>
         </SegmentBase>
diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output_video_trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/output_video-trick_play_factor_1.mp4
similarity index 100%
rename from packager/app/test/testdata/audio-video-with-trick-play/output_video_trick_play_factor_1.mp4
rename to packager/app/test/testdata/audio-video-with-trick-play/output_video-trick_play_factor_1.mp4
diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd
index 6a5bbe8238..775d130714 100644
--- a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd
+++ b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd
@@ -13,13 +13,13 @@
     <AdaptationSet id="1" contentType="video" width="640" height="360" maxFrameRate="30000/30030" par="16:9">
       <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
       <Representation id="1" bandwidth="103866" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false">
-        <BaseURL>output_video_trick_play_factor_2.mp4</BaseURL>
+        <BaseURL>output_video-trick_play_factor_2.mp4</BaseURL>
         <SegmentBase indexRange="823-878" timescale="30000">
           <Initialization range="0-822"/>
         </SegmentBase>
       </Representation>
       <Representation id="2" bandwidth="156160" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false">
-        <BaseURL>output_video_trick_play_factor_1.mp4</BaseURL>
+        <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
         <SegmentBase indexRange="823-890" timescale="30000">
           <Initialization range="0-822"/>
         </SegmentBase>
diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_1.mp4
similarity index 100%
rename from packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_1.mp4
rename to packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_1.mp4
diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_2.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_2.mp4
similarity index 100%
rename from packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_2.mp4
rename to packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_2.mp4
diff --git a/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd
index 1dd7459081..56fc7c78f4 100644
--- a/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd
@@ -17,7 +17,7 @@
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
       <Representation id="1" bandwidth="126510" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
-        <BaseURL>output_audio_skip_encryption.mp4</BaseURL>
+        <BaseURL>output_audio-skip_encryption.mp4</BaseURL>
         <SegmentBase indexRange="757-824" timescale="44100">
           <Initialization range="0-756"/>
         </SegmentBase>
diff --git a/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd
index 9c7d256e7b..441cd7a940 100644
--- a/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd
@@ -21,7 +21,7 @@
       </ContentProtection>
       <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
       <Representation id="1" bandwidth="157348" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false">
-        <BaseURL>output_video_trick_play_factor_1.mp4</BaseURL>
+        <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
         <SegmentBase indexRange="1091-1158" timescale="30000">
           <Initialization range="0-1090"/>
         </SegmentBase>
diff --git a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd
index 711c66824b..c33d3268d5 100644
--- a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd
@@ -21,13 +21,13 @@
       </ContentProtection>
       <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
       <Representation id="1" bandwidth="104852" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false">
-        <BaseURL>output_video_trick_play_factor_2.mp4</BaseURL>
+        <BaseURL>output_video-trick_play_factor_2.mp4</BaseURL>
         <SegmentBase indexRange="1091-1146" timescale="30000">
           <Initialization range="0-1090"/>
         </SegmentBase>
       </Representation>
       <Representation id="2" bandwidth="157348" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false">
-        <BaseURL>output_video_trick_play_factor_1.mp4</BaseURL>
+        <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
         <SegmentBase indexRange="1091-1158" timescale="30000">
           <Initialization range="0-1090"/>
         </SegmentBase>