diff --git a/enctests/testframework/encoders/ffmpeg_encoder.py b/enctests/testframework/encoders/ffmpeg_encoder.py
index 4c0cec6..3c9daf1 100644
--- a/enctests/testframework/encoders/ffmpeg_encoder.py
+++ b/enctests/testframework/encoders/ffmpeg_encoder.py
@@ -48,7 +48,7 @@ def run_wedges(self) -> dict:
         for wedge_name, wedge in self.test_config.get('wedges', {}).items():
             # Test name is based on main test name and wedge name
             test_name = f"{self.test_config.get('name')}-{wedge_name}"
-            out_file = self.get_output_filename(test_name)
+            out_file, testbasename = self.get_output_filename(test_name)
 
             # Remove it, so if the new run fails to create anything 
             # we are not accidently using the old one.
@@ -101,7 +101,8 @@ def run_wedges(self) -> dict:
             test_meta['command'] = cmd
             test_meta['encode_arguments'] = wedge
             test_meta['description'] = self.test_config.get('description')
-
+            test_meta['outputfile'] = str(out_file)
+            test_meta['testbasename'] = testbasename
             result_meta = test_meta.setdefault('results', {})
             result_meta['completed_utc'] = \
                 datetime.now(timezone.utc).isoformat()
@@ -172,15 +173,17 @@ def get_source_path(self) -> Tuple[pathlib.Path, str]:
 
         return path, symbol
 
-    def get_output_filename(self, test_name: str) -> pathlib.Path:
+    def get_output_filename(self, test_name: str) -> Tuple[pathlib.Path, str]:
         source_path, symbol = self.get_source_path()
         stem = source_path.stem.replace(symbol, '')
         if stem[-1] == ".":
             stem = stem[:-1]
     
+        testbasename = f"{stem}-{test_name}"
+
         out_file = self.destination.absolute().joinpath(
-            f"{stem}-{test_name}{self.test_config.get('suffix')}"
+            f"{testbasename}{self.test_config.get('suffix')}"
         )
 
-        return out_file
+        return out_file, testbasename
 
diff --git a/enctests/testframework/templates/basic.html.jinja b/enctests/testframework/templates/basic.html.jinja
index 2f5e0ef..160b487 100644
--- a/enctests/testframework/templates/basic.html.jinja
+++ b/enctests/testframework/templates/basic.html.jinja
@@ -48,8 +48,8 @@
    </TR>
   {% for enc_info in test.results %}
     <TR>
-    <TH><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</a></TH>
-        <td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">Test {{ enc_info.testresult}}</A> </TD>
+    <TH><A  target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</a></TH>
+        <td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">Test {{ enc_info.testresult}}</A> </TD>
         <td align=right>{{ enc_info.encode_time}} </TD>
         <td align=right>{{ enc_info.filesize}} </TD>
         <TD align=right>{{enc_info.vmaf_harmonic_mean |e }}</TD>
diff --git a/enctests/testframework/templates/basicmovie.html.jinja b/enctests/testframework/templates/basicmovie.html.jinja
index ee85e19..cdea725 100644
--- a/enctests/testframework/templates/basicmovie.html.jinja
+++ b/enctests/testframework/templates/basicmovie.html.jinja
@@ -50,8 +50,8 @@
    </TR>
   {% for enc_info in test.results %}
     <TR>
-     <TH><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</a></TH>
-        <td align=right><A target="_blank" HREF="{{ test.default_media.basename  }}-{{ enc_info.name|e }}_tests.log">Result - {{ enc_info.testresult }}</A> </TD>
+     <TH><A  target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</a></TH>
+        <td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">Result - {{ enc_info.testresult }}</A> </TD>
         <td align=right>{{ enc_info.encode_time}} </TD>
         <td align=right>{{ "{:,}".format(enc_info.filesize) }} </TD>
         <TD align=right>{{enc_info.vmaf_harmonic_mean |e }}</TD>
@@ -90,7 +90,7 @@
    </TR>
   {% for enc_info in test.results %}
     <TR>
-    <TH><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
+    <TH><A  target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
         <td align=right><video width="500px" controls <source type='video/mp4' src="{{ enc_info.output_media | e }}"/> </video></TD>
         <TD>{{enc_info.encode_arguments | e}}</TD>
     </TR>
diff --git a/enctests/testframework/templates/basicpictures.html.jinja b/enctests/testframework/templates/basicpictures.html.jinja
index d0788b6..09387e2 100644
--- a/enctests/testframework/templates/basicpictures.html.jinja
+++ b/enctests/testframework/templates/basicpictures.html.jinja
@@ -47,7 +47,7 @@
    </TR>
   {% for enc_info in test.results %}
     <TR>
-    <TH><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
+    <TH><A  target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
         <td align=right>{{ enc_info.encode_time}} </TD>
         <td align=right>{{ "{:,}".format(enc_info.filesize) }} </TD>
         <TD align=right>{{enc_info.vmaf.harmonic_mean |e }}</TD>
diff --git a/enctests/testframework/templates/colorweb.html.jinja b/enctests/testframework/templates/colorweb.html.jinja
index de1fef1..c6699a8 100644
--- a/enctests/testframework/templates/colorweb.html.jinja
+++ b/enctests/testframework/templates/colorweb.html.jinja
@@ -47,8 +47,8 @@
    </TR>
   {% for enc_info in test.results %}
     <TR>
-    <TH><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
-        <td align=right><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">{{ enc_info.testresult }}</A> </TD>
+    <TH><A  target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
+        <td align=right><A  target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">{{ enc_info.testresult }}</A> </TD>
         <td align=right>{{ enc_info.mean_error}} </TD>
         <td align=right>{{ enc_info.max_error}} </TD>
         <td align=right>{{ enc_info.encode_time}} </TD>
diff --git a/enctests/testframework/templates/doctests.html.jinja b/enctests/testframework/templates/doctests.html.jinja
index becc092..a842fa6 100644
--- a/enctests/testframework/templates/doctests.html.jinja
+++ b/enctests/testframework/templates/doctests.html.jinja
@@ -43,10 +43,10 @@
    </TR>
   {% for enc_info in test.results %}
     <TR>
-    <TH><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
-        <td align=right><A  target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">{{ enc_info.testresult}}</A> </TD>
+    <TH><A  target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
+        <td align=right><A  target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">{{ enc_info.testresult}}</A> </TD>
         <td align=right>{{ enc_info.mean_error}} </TD>
-        <td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}-x20diff.png">{{ enc_info.max_error}} </A></TD>
+        <td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}-x20diff.png">{{ enc_info.max_error}} </A></TD>
         <td align=right>{{ enc_info.encode_time}} </TD>
         <td align=right>{{ "{:,}".format(enc_info.filesize) }} </TD>
         <TD>{{enc_info.command | e}}</TD>
diff --git a/enctests/testframework/utils/outputTemplate.py b/enctests/testframework/utils/outputTemplate.py
index 63703b6..622fee9 100644
--- a/enctests/testframework/utils/outputTemplate.py
+++ b/enctests/testframework/utils/outputTemplate.py
@@ -72,6 +72,7 @@ def processTemplate(config, timeline):
               continue
           merge_test_info = test_info.metadata['aswf_enctests']['results']
           merge_test_info['name'] = ref_name
+          merge_test_info['testbasename'] = test_info.metadata['aswf_enctests']['testbasename']
           merge_test_info['wedge'] = ref_name.replace(track.metadata.get('source_test_name', '')+"-", "")
           if 'description' in test_info.metadata['aswf_enctests']:
             merge_test_info['test_description'] = test_info.metadata['aswf_enctests']['description']