diff --git a/SourceGen/SGTestData/2005-string-types b/SourceGen/SGTestData/20010-string-types
similarity index 100%
rename from SourceGen/SGTestData/2005-string-types
rename to SourceGen/SGTestData/20010-string-types
diff --git a/SourceGen/SGTestData/2005-string-types.dis65 b/SourceGen/SGTestData/20010-string-types.dis65
similarity index 100%
rename from SourceGen/SGTestData/2005-string-types.dis65
rename to SourceGen/SGTestData/20010-string-types.dis65
diff --git a/SourceGen/SGTestData/2006-operand-formats b/SourceGen/SGTestData/20022-operand-formats
similarity index 100%
rename from SourceGen/SGTestData/2006-operand-formats
rename to SourceGen/SGTestData/20022-operand-formats
diff --git a/SourceGen/SGTestData/2006-operand-formats.dis65 b/SourceGen/SGTestData/20022-operand-formats.dis65
similarity index 100%
rename from SourceGen/SGTestData/2006-operand-formats.dis65
rename to SourceGen/SGTestData/20022-operand-formats.dis65
diff --git a/SourceGen/SGTestData/2007-labels-and-symbols.sym65 b/SourceGen/SGTestData/20030-labels-and-symbols.sym65
similarity index 100%
rename from SourceGen/SGTestData/2007-labels-and-symbols.sym65
rename to SourceGen/SGTestData/20030-labels-and-symbols.sym65
diff --git a/SourceGen/SGTestData/2007-labels-and-symbols b/SourceGen/SGTestData/20032-labels-and-symbols
similarity index 100%
rename from SourceGen/SGTestData/2007-labels-and-symbols
rename to SourceGen/SGTestData/20032-labels-and-symbols
diff --git a/SourceGen/SGTestData/2007-labels-and-symbols.dis65 b/SourceGen/SGTestData/20032-labels-and-symbols.dis65
similarity index 99%
rename from SourceGen/SGTestData/2007-labels-and-symbols.dis65
rename to SourceGen/SGTestData/20032-labels-and-symbols.dis65
index 063a697..c6af906 100644
--- a/SourceGen/SGTestData/2007-labels-and-symbols.dis65
+++ b/SourceGen/SGTestData/20032-labels-and-symbols.dis65
@@ -16,7 +16,7 @@
 "SeekNearbyTargets":true,
 "SmartPlpHandling":true},
 
-"PlatformSymbolFileIdentifiers":["PROJ:2007-labels-and-symbols.sym65",
+"PlatformSymbolFileIdentifiers":["PROJ:20030-labels-and-symbols.sym65",
 "RT:TestData/TestSyms.sym65"],
 "ExtensionScriptFileIdentifiers":[],
 "ProjectSyms":{
diff --git a/SourceGen/SGTestData/2008-address-changes b/SourceGen/SGTestData/20042-address-changes
similarity index 100%
rename from SourceGen/SGTestData/2008-address-changes
rename to SourceGen/SGTestData/20042-address-changes
diff --git a/SourceGen/SGTestData/2008-address-changes.dis65 b/SourceGen/SGTestData/20042-address-changes.dis65
similarity index 100%
rename from SourceGen/SGTestData/2008-address-changes.dis65
rename to SourceGen/SGTestData/20042-address-changes.dis65
diff --git a/SourceGen/SGTestData/2009-branches-and-banks.sym65 b/SourceGen/SGTestData/20050-branches-and-banks.sym65
similarity index 100%
rename from SourceGen/SGTestData/2009-branches-and-banks.sym65
rename to SourceGen/SGTestData/20050-branches-and-banks.sym65
diff --git a/SourceGen/SGTestData/2009-branches-and-banks b/SourceGen/SGTestData/20052-branches-and-banks
similarity index 100%
rename from SourceGen/SGTestData/2009-branches-and-banks
rename to SourceGen/SGTestData/20052-branches-and-banks
diff --git a/SourceGen/SGTestData/2009-branches-and-banks.dis65 b/SourceGen/SGTestData/20052-branches-and-banks.dis65
similarity index 93%
rename from SourceGen/SGTestData/2009-branches-and-banks.dis65
rename to SourceGen/SGTestData/20052-branches-and-banks.dis65
index d0ee23b..32b857e 100644
--- a/SourceGen/SGTestData/2009-branches-and-banks.dis65
+++ b/SourceGen/SGTestData/20052-branches-and-banks.dis65
@@ -3,7 +3,7 @@
 "_ContentVersion":2,"FileDataLength":119,"FileDataCrc32":-1095650494,"ProjectProps":{
 "CpuName":"65816","IncludeUndocumentedInstr":false,"TwoByteBrk":false,"EntryFlags":33489103,"AutoLabelStyle":"Simple","AnalysisParams":{
 "AnalyzeUncategorizedData":true,"DefaultTextScanMode":"LowHighAscii","MinCharsForString":4,"SeekNearbyTargets":true,"SmartPlpHandling":true},
-"PlatformSymbolFileIdentifiers":["PROJ:2009-branches-and-banks.sym65"],"ExtensionScriptFileIdentifiers":[],"ProjectSyms":{
+"PlatformSymbolFileIdentifiers":["PROJ:20050-branches-and-banks.sym65"],"ExtensionScriptFileIdentifiers":[],"ProjectSyms":{
 }},
 "AddressMap":[{
 "Offset":0,"Addr":4096},
diff --git a/SourceGen/SGTestData/2010-target-adjustment b/SourceGen/SGTestData/20062-target-adjustment
similarity index 100%
rename from SourceGen/SGTestData/2010-target-adjustment
rename to SourceGen/SGTestData/20062-target-adjustment
diff --git a/SourceGen/SGTestData/2010-target-adjustment.dis65 b/SourceGen/SGTestData/20062-target-adjustment.dis65
similarity index 100%
rename from SourceGen/SGTestData/2010-target-adjustment.dis65
rename to SourceGen/SGTestData/20062-target-adjustment.dis65
diff --git a/SourceGen/SGTestData/2011-hinting b/SourceGen/SGTestData/20070-hinting
similarity index 100%
rename from SourceGen/SGTestData/2011-hinting
rename to SourceGen/SGTestData/20070-hinting
diff --git a/SourceGen/SGTestData/2011-hinting.cs b/SourceGen/SGTestData/20070-hinting.cs
similarity index 100%
rename from SourceGen/SGTestData/2011-hinting.cs
rename to SourceGen/SGTestData/20070-hinting.cs
diff --git a/SourceGen/SGTestData/2011-hinting.dis65 b/SourceGen/SGTestData/20070-hinting.dis65
similarity index 95%
rename from SourceGen/SGTestData/2011-hinting.dis65
rename to SourceGen/SGTestData/20070-hinting.dis65
index ec1f70e..2be9ffa 100644
--- a/SourceGen/SGTestData/2011-hinting.dis65
+++ b/SourceGen/SGTestData/20070-hinting.dis65
@@ -3,7 +3,7 @@
 "_ContentVersion":2,"FileDataLength":72,"FileDataCrc32":-800253778,"ProjectProps":{
 "CpuName":"6502","IncludeUndocumentedInstr":false,"EntryFlags":33489103,"AutoLabelStyle":"Simple","AnalysisParams":{
 "AnalyzeUncategorizedData":true,"DefaultTextScanMode":"LowHighAscii","MinCharsForString":4,"SeekNearbyTargets":true,"SmartPlpHandling":true},
-"PlatformSymbolFileIdentifiers":[],"ExtensionScriptFileIdentifiers":["PROJ:2011-hinting.cs"],"ProjectSyms":{
+"PlatformSymbolFileIdentifiers":[],"ExtensionScriptFileIdentifiers":["PROJ:20070-hinting.cs"],"ProjectSyms":{
 }},
 "AddressMap":[{
 "Offset":0,"Addr":4096}],"TypeHints":[{
diff --git a/SourceGen/SGTestData/2012-label-localizer b/SourceGen/SGTestData/20081-label-localizer
similarity index 100%
rename from SourceGen/SGTestData/2012-label-localizer
rename to SourceGen/SGTestData/20081-label-localizer
diff --git a/SourceGen/SGTestData/2012-label-localizer.dis65 b/SourceGen/SGTestData/20081-label-localizer.dis65
similarity index 100%
rename from SourceGen/SGTestData/2012-label-localizer.dis65
rename to SourceGen/SGTestData/20081-label-localizer.dis65
diff --git a/SourceGen/SGTestData/2013-notes-and-comments b/SourceGen/SGTestData/20090-notes-and-comments
similarity index 100%
rename from SourceGen/SGTestData/2013-notes-and-comments
rename to SourceGen/SGTestData/20090-notes-and-comments
diff --git a/SourceGen/SGTestData/2013-notes-and-comments.dis65 b/SourceGen/SGTestData/20090-notes-and-comments.dis65
similarity index 100%
rename from SourceGen/SGTestData/2013-notes-and-comments.dis65
rename to SourceGen/SGTestData/20090-notes-and-comments.dis65
diff --git a/SourceGen/SGTestData/2014-label-dp b/SourceGen/SGTestData/20102-label-dp
similarity index 100%
rename from SourceGen/SGTestData/2014-label-dp
rename to SourceGen/SGTestData/20102-label-dp
diff --git a/SourceGen/SGTestData/2014-label-dp.dis65 b/SourceGen/SGTestData/20102-label-dp.dis65
similarity index 100%
rename from SourceGen/SGTestData/2014-label-dp.dis65
rename to SourceGen/SGTestData/20102-label-dp.dis65
diff --git a/SourceGen/SGTestData/2015-64k-nops b/SourceGen/SGTestData/20110-64k-nops
similarity index 100%
rename from SourceGen/SGTestData/2015-64k-nops
rename to SourceGen/SGTestData/20110-64k-nops
diff --git a/SourceGen/SGTestData/2015-64k-nops.dis65 b/SourceGen/SGTestData/20110-64k-nops.dis65
similarity index 100%
rename from SourceGen/SGTestData/2015-64k-nops.dis65
rename to SourceGen/SGTestData/20110-64k-nops.dis65
diff --git a/SourceGen/SGTestData/2016-char-encoding-a b/SourceGen/SGTestData/20122-char-encoding-a
similarity index 100%
rename from SourceGen/SGTestData/2016-char-encoding-a
rename to SourceGen/SGTestData/20122-char-encoding-a
diff --git a/SourceGen/SGTestData/2016-char-encoding-a.dis65 b/SourceGen/SGTestData/20122-char-encoding-a.dis65
similarity index 100%
rename from SourceGen/SGTestData/2016-char-encoding-a.dis65
rename to SourceGen/SGTestData/20122-char-encoding-a.dis65
diff --git a/SourceGen/SGTestData/2017-char-encoding-p b/SourceGen/SGTestData/20132-char-encoding-p
similarity index 100%
rename from SourceGen/SGTestData/2017-char-encoding-p
rename to SourceGen/SGTestData/20132-char-encoding-p
diff --git a/SourceGen/SGTestData/2017-char-encoding-p.dis65 b/SourceGen/SGTestData/20132-char-encoding-p.dis65
similarity index 100%
rename from SourceGen/SGTestData/2017-char-encoding-p.dis65
rename to SourceGen/SGTestData/20132-char-encoding-p.dis65
diff --git a/SourceGen/SGTestData/2018-char-encoding-s b/SourceGen/SGTestData/20142-char-encoding-s
similarity index 100%
rename from SourceGen/SGTestData/2018-char-encoding-s
rename to SourceGen/SGTestData/20142-char-encoding-s
diff --git a/SourceGen/SGTestData/2018-char-encoding-s.dis65 b/SourceGen/SGTestData/20142-char-encoding-s.dis65
similarity index 100%
rename from SourceGen/SGTestData/2018-char-encoding-s.dis65
rename to SourceGen/SGTestData/20142-char-encoding-s.dis65
diff --git a/SourceGen/SGTestData/2019-local-variables b/SourceGen/SGTestData/20152-local-variables
similarity index 100%
rename from SourceGen/SGTestData/2019-local-variables
rename to SourceGen/SGTestData/20152-local-variables
diff --git a/SourceGen/SGTestData/2019-local-variables.dis65 b/SourceGen/SGTestData/20152-local-variables.dis65
similarity index 100%
rename from SourceGen/SGTestData/2019-local-variables.dis65
rename to SourceGen/SGTestData/20152-local-variables.dis65
diff --git a/SourceGen/SGTestData/2020-cycle-counts-65816 b/SourceGen/SGTestData/20162-cycle-counts-65816
similarity index 100%
rename from SourceGen/SGTestData/2020-cycle-counts-65816
rename to SourceGen/SGTestData/20162-cycle-counts-65816
diff --git a/SourceGen/SGTestData/2020-cycle-counts-65816.dis65 b/SourceGen/SGTestData/20162-cycle-counts-65816.dis65
similarity index 100%
rename from SourceGen/SGTestData/2020-cycle-counts-65816.dis65
rename to SourceGen/SGTestData/20162-cycle-counts-65816.dis65
diff --git a/SourceGen/SGTestData/2021-external-symbols b/SourceGen/SGTestData/20170-external-symbols
similarity index 100%
rename from SourceGen/SGTestData/2021-external-symbols
rename to SourceGen/SGTestData/20170-external-symbols
diff --git a/SourceGen/SGTestData/2021-external-symbols-1.sym65 b/SourceGen/SGTestData/20170-external-symbols-1.sym65
similarity index 100%
rename from SourceGen/SGTestData/2021-external-symbols-1.sym65
rename to SourceGen/SGTestData/20170-external-symbols-1.sym65
diff --git a/SourceGen/SGTestData/2021-external-symbols-2.sym65 b/SourceGen/SGTestData/20170-external-symbols-2.sym65
similarity index 100%
rename from SourceGen/SGTestData/2021-external-symbols-2.sym65
rename to SourceGen/SGTestData/20170-external-symbols-2.sym65
diff --git a/SourceGen/SGTestData/2021-external-symbols-3.sym65 b/SourceGen/SGTestData/20170-external-symbols-3.sym65
similarity index 100%
rename from SourceGen/SGTestData/2021-external-symbols-3.sym65
rename to SourceGen/SGTestData/20170-external-symbols-3.sym65
diff --git a/SourceGen/SGTestData/2021-external-symbols.dis65 b/SourceGen/SGTestData/20170-external-symbols.dis65
similarity index 87%
rename from SourceGen/SGTestData/2021-external-symbols.dis65
rename to SourceGen/SGTestData/20170-external-symbols.dis65
index b740ba0..049369a 100644
--- a/SourceGen/SGTestData/2021-external-symbols.dis65
+++ b/SourceGen/SGTestData/20170-external-symbols.dis65
@@ -3,7 +3,7 @@
 "_ContentVersion":2,"FileDataLength":353,"FileDataCrc32":2100812075,"ProjectProps":{
 "CpuName":"6502","IncludeUndocumentedInstr":false,"EntryFlags":32702671,"AutoLabelStyle":"Simple","AnalysisParams":{
 "AnalyzeUncategorizedData":true,"DefaultTextScanMode":"LowHighAscii","MinCharsForString":4,"SeekNearbyTargets":true,"SmartPlpHandling":true},
-"PlatformSymbolFileIdentifiers":["PROJ:2021-external-symbols-1.sym65","PROJ:2021-external-symbols-2.sym65","PROJ:2021-external-symbols-3.sym65"],"ExtensionScriptFileIdentifiers":[],"ProjectSyms":{
+"PlatformSymbolFileIdentifiers":["PROJ:20170-external-symbols-1.sym65","PROJ:20170-external-symbols-2.sym65","PROJ:20170-external-symbols-3.sym65"],"ExtensionScriptFileIdentifiers":[],"ProjectSyms":{
 "ProjSym1":{
 "DataDescriptor":{
 "Length":4,"Format":"NumericLE","SubFormat":"Hex","SymbolRef":null},
diff --git a/SourceGen/SGTestData/2022-extension-scripts-a.cs b/SourceGen/SGTestData/20180-extension-scripts-a.cs
similarity index 100%
rename from SourceGen/SGTestData/2022-extension-scripts-a.cs
rename to SourceGen/SGTestData/20180-extension-scripts-a.cs
diff --git a/SourceGen/SGTestData/2022-extension-scripts-b.cs b/SourceGen/SGTestData/20180-extension-scripts-b.cs
similarity index 100%
rename from SourceGen/SGTestData/2022-extension-scripts-b.cs
rename to SourceGen/SGTestData/20180-extension-scripts-b.cs
diff --git a/SourceGen/SGTestData/2022-extension-scripts.sym65 b/SourceGen/SGTestData/20180-extension-scripts.sym65
similarity index 100%
rename from SourceGen/SGTestData/2022-extension-scripts.sym65
rename to SourceGen/SGTestData/20180-extension-scripts.sym65
diff --git a/SourceGen/SGTestData/2022-extension-scripts b/SourceGen/SGTestData/20182-extension-scripts
similarity index 100%
rename from SourceGen/SGTestData/2022-extension-scripts
rename to SourceGen/SGTestData/20182-extension-scripts
diff --git a/SourceGen/SGTestData/2022-extension-scripts.dis65 b/SourceGen/SGTestData/20182-extension-scripts.dis65
similarity index 91%
rename from SourceGen/SGTestData/2022-extension-scripts.dis65
rename to SourceGen/SGTestData/20182-extension-scripts.dis65
index 0c28820..ae58546 100644
--- a/SourceGen/SGTestData/2022-extension-scripts.dis65
+++ b/SourceGen/SGTestData/20182-extension-scripts.dis65
@@ -16,9 +16,9 @@
 "SeekNearbyTargets":true,
 "SmartPlpHandling":true},
 
-"PlatformSymbolFileIdentifiers":["PROJ:2022-extension-scripts.sym65"],
-"ExtensionScriptFileIdentifiers":["PROJ:2022-extension-scripts-a.cs",
-"PROJ:2022-extension-scripts-b.cs"],
+"PlatformSymbolFileIdentifiers":["PROJ:20180-extension-scripts.sym65"],
+"ExtensionScriptFileIdentifiers":["PROJ:20180-extension-scripts-a.cs",
+"PROJ:20180-extension-scripts-b.cs"],
 "ProjectSyms":{
 "PrintInlineDciString":{
 "DataDescriptor":{
diff --git a/SourceGen/SGTestData/2023-non-unique-labels b/SourceGen/SGTestData/20190-non-unique-labels
similarity index 100%
rename from SourceGen/SGTestData/2023-non-unique-labels
rename to SourceGen/SGTestData/20190-non-unique-labels
diff --git a/SourceGen/SGTestData/2023-non-unique-labels.dis65 b/SourceGen/SGTestData/20190-non-unique-labels.dis65
similarity index 100%
rename from SourceGen/SGTestData/2023-non-unique-labels.dis65
rename to SourceGen/SGTestData/20190-non-unique-labels.dis65
diff --git a/SourceGen/SGTestData/2024-ui-edge-cases b/SourceGen/SGTestData/20200-ui-edge-cases
similarity index 100%
rename from SourceGen/SGTestData/2024-ui-edge-cases
rename to SourceGen/SGTestData/20200-ui-edge-cases
diff --git a/SourceGen/SGTestData/2024-ui-edge-cases.dis65 b/SourceGen/SGTestData/20200-ui-edge-cases.dis65
similarity index 100%
rename from SourceGen/SGTestData/2024-ui-edge-cases.dis65
rename to SourceGen/SGTestData/20200-ui-edge-cases.dis65
diff --git a/SourceGen/SGTestData/Expected/2005-string-types_64tass.S b/SourceGen/SGTestData/Expected/20010-string-types_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2005-string-types_64tass.S
rename to SourceGen/SGTestData/Expected/20010-string-types_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2005-string-types_Merlin32.S b/SourceGen/SGTestData/Expected/20010-string-types_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2005-string-types_Merlin32.S
rename to SourceGen/SGTestData/Expected/20010-string-types_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2005-string-types_acme.S b/SourceGen/SGTestData/Expected/20010-string-types_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2005-string-types_acme.S
rename to SourceGen/SGTestData/Expected/20010-string-types_acme.S
diff --git a/SourceGen/SGTestData/Expected/2005-string-types_cc65.S b/SourceGen/SGTestData/Expected/20010-string-types_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2005-string-types_cc65.S
rename to SourceGen/SGTestData/Expected/20010-string-types_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2005-string-types_cc65.cfg b/SourceGen/SGTestData/Expected/20010-string-types_cc65.cfg
similarity index 74%
rename from SourceGen/SGTestData/Expected/2005-string-types_cc65.cfg
rename to SourceGen/SGTestData/Expected/20010-string-types_cc65.cfg
index 6b6cc57..de91b84 100644
--- a/SourceGen/SGTestData/Expected/2005-string-types_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20010-string-types_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2005-string-types
+# 6502bench SourceGen generated linker script for 20010-string-types
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=3132;
diff --git a/SourceGen/SGTestData/Expected/2006-operand-formats_64tass.S b/SourceGen/SGTestData/Expected/20022-operand-formats_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2006-operand-formats_64tass.S
rename to SourceGen/SGTestData/Expected/20022-operand-formats_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2006-operand-formats_Merlin32.S b/SourceGen/SGTestData/Expected/20022-operand-formats_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2006-operand-formats_Merlin32.S
rename to SourceGen/SGTestData/Expected/20022-operand-formats_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2006-operand-formats_acme.S b/SourceGen/SGTestData/Expected/20022-operand-formats_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2006-operand-formats_acme.S
rename to SourceGen/SGTestData/Expected/20022-operand-formats_acme.S
diff --git a/SourceGen/SGTestData/Expected/2006-operand-formats_cc65.S b/SourceGen/SGTestData/Expected/20022-operand-formats_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2006-operand-formats_cc65.S
rename to SourceGen/SGTestData/Expected/20022-operand-formats_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2006-operand-formats_cc65.cfg b/SourceGen/SGTestData/Expected/20022-operand-formats_cc65.cfg
similarity index 73%
rename from SourceGen/SGTestData/Expected/2006-operand-formats_cc65.cfg
rename to SourceGen/SGTestData/Expected/20022-operand-formats_cc65.cfg
index f5aa693..676945d 100644
--- a/SourceGen/SGTestData/Expected/2006-operand-formats_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20022-operand-formats_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2006-operand-formats
+# 6502bench SourceGen generated linker script for 20022-operand-formats
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=143;
diff --git a/SourceGen/SGTestData/Expected/2007-labels-and-symbols_64tass.S b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2007-labels-and-symbols_64tass.S
rename to SourceGen/SGTestData/Expected/20032-labels-and-symbols_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2007-labels-and-symbols_Merlin32.S b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2007-labels-and-symbols_Merlin32.S
rename to SourceGen/SGTestData/Expected/20032-labels-and-symbols_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2007-labels-and-symbols_acme.S b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2007-labels-and-symbols_acme.S
rename to SourceGen/SGTestData/Expected/20032-labels-and-symbols_acme.S
diff --git a/SourceGen/SGTestData/Expected/2007-labels-and-symbols_cc65.S b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2007-labels-and-symbols_cc65.S
rename to SourceGen/SGTestData/Expected/20032-labels-and-symbols_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2007-labels-and-symbols_cc65.cfg b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_cc65.cfg
similarity index 78%
rename from SourceGen/SGTestData/Expected/2007-labels-and-symbols_cc65.cfg
rename to SourceGen/SGTestData/Expected/20032-labels-and-symbols_cc65.cfg
index d2ff055..91e5948 100644
--- a/SourceGen/SGTestData/Expected/2007-labels-and-symbols_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2007-labels-and-symbols
+# 6502bench SourceGen generated linker script for 20032-labels-and-symbols
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$12345, size=279;
diff --git a/SourceGen/SGTestData/Expected/2008-address-changes_64tass.S b/SourceGen/SGTestData/Expected/20042-address-changes_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2008-address-changes_64tass.S
rename to SourceGen/SGTestData/Expected/20042-address-changes_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2008-address-changes_Merlin32.S b/SourceGen/SGTestData/Expected/20042-address-changes_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2008-address-changes_Merlin32.S
rename to SourceGen/SGTestData/Expected/20042-address-changes_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2008-address-changes_acme.S b/SourceGen/SGTestData/Expected/20042-address-changes_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2008-address-changes_acme.S
rename to SourceGen/SGTestData/Expected/20042-address-changes_acme.S
diff --git a/SourceGen/SGTestData/Expected/2008-address-changes_cc65.S b/SourceGen/SGTestData/Expected/20042-address-changes_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2008-address-changes_cc65.S
rename to SourceGen/SGTestData/Expected/20042-address-changes_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2008-address-changes_cc65.cfg b/SourceGen/SGTestData/Expected/20042-address-changes_cc65.cfg
similarity index 94%
rename from SourceGen/SGTestData/Expected/2008-address-changes_cc65.cfg
rename to SourceGen/SGTestData/Expected/20042-address-changes_cc65.cfg
index cbdc389..282f00e 100644
--- a/SourceGen/SGTestData/Expected/2008-address-changes_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20042-address-changes_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2008-address-changes
+# 6502bench SourceGen generated linker script for 20042-address-changes
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=13;
diff --git a/SourceGen/SGTestData/Expected/2009-branches-and-banks_64tass.S b/SourceGen/SGTestData/Expected/20052-branches-and-banks_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2009-branches-and-banks_64tass.S
rename to SourceGen/SGTestData/Expected/20052-branches-and-banks_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2009-branches-and-banks_Merlin32.S b/SourceGen/SGTestData/Expected/20052-branches-and-banks_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2009-branches-and-banks_Merlin32.S
rename to SourceGen/SGTestData/Expected/20052-branches-and-banks_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2009-branches-and-banks_acme.S b/SourceGen/SGTestData/Expected/20052-branches-and-banks_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2009-branches-and-banks_acme.S
rename to SourceGen/SGTestData/Expected/20052-branches-and-banks_acme.S
diff --git a/SourceGen/SGTestData/Expected/2009-branches-and-banks_cc65.S b/SourceGen/SGTestData/Expected/20052-branches-and-banks_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2009-branches-and-banks_cc65.S
rename to SourceGen/SGTestData/Expected/20052-branches-and-banks_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2009-branches-and-banks_cc65.cfg b/SourceGen/SGTestData/Expected/20052-branches-and-banks_cc65.cfg
similarity index 89%
rename from SourceGen/SGTestData/Expected/2009-branches-and-banks_cc65.cfg
rename to SourceGen/SGTestData/Expected/20052-branches-and-banks_cc65.cfg
index b8200b6..ef3f98f 100644
--- a/SourceGen/SGTestData/Expected/2009-branches-and-banks_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20052-branches-and-banks_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2009-branches-and-banks
+# 6502bench SourceGen generated linker script for 20052-branches-and-banks
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=7;
diff --git a/SourceGen/SGTestData/Expected/2010-target-adjustment_64tass.S b/SourceGen/SGTestData/Expected/20062-target-adjustment_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2010-target-adjustment_64tass.S
rename to SourceGen/SGTestData/Expected/20062-target-adjustment_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2010-target-adjustment_Merlin32.S b/SourceGen/SGTestData/Expected/20062-target-adjustment_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2010-target-adjustment_Merlin32.S
rename to SourceGen/SGTestData/Expected/20062-target-adjustment_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2010-target-adjustment_acme.S b/SourceGen/SGTestData/Expected/20062-target-adjustment_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2010-target-adjustment_acme.S
rename to SourceGen/SGTestData/Expected/20062-target-adjustment_acme.S
diff --git a/SourceGen/SGTestData/Expected/2010-target-adjustment_cc65.S b/SourceGen/SGTestData/Expected/20062-target-adjustment_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2010-target-adjustment_cc65.S
rename to SourceGen/SGTestData/Expected/20062-target-adjustment_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2010-target-adjustment_cc65.cfg b/SourceGen/SGTestData/Expected/20062-target-adjustment_cc65.cfg
similarity index 78%
rename from SourceGen/SGTestData/Expected/2010-target-adjustment_cc65.cfg
rename to SourceGen/SGTestData/Expected/20062-target-adjustment_cc65.cfg
index 1ffbb06..9120058 100644
--- a/SourceGen/SGTestData/Expected/2010-target-adjustment_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20062-target-adjustment_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2010-target-adjustment
+# 6502bench SourceGen generated linker script for 20062-target-adjustment
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=133;
diff --git a/SourceGen/SGTestData/Expected/2011-hinting_64tass.S b/SourceGen/SGTestData/Expected/20070-hinting_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2011-hinting_64tass.S
rename to SourceGen/SGTestData/Expected/20070-hinting_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2011-hinting_Merlin32.S b/SourceGen/SGTestData/Expected/20070-hinting_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2011-hinting_Merlin32.S
rename to SourceGen/SGTestData/Expected/20070-hinting_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2011-hinting_acme.S b/SourceGen/SGTestData/Expected/20070-hinting_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2011-hinting_acme.S
rename to SourceGen/SGTestData/Expected/20070-hinting_acme.S
diff --git a/SourceGen/SGTestData/Expected/2011-hinting_cc65.S b/SourceGen/SGTestData/Expected/20070-hinting_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2011-hinting_cc65.S
rename to SourceGen/SGTestData/Expected/20070-hinting_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2011-hinting_cc65.cfg b/SourceGen/SGTestData/Expected/20070-hinting_cc65.cfg
similarity index 75%
rename from SourceGen/SGTestData/Expected/2011-hinting_cc65.cfg
rename to SourceGen/SGTestData/Expected/20070-hinting_cc65.cfg
index e856535..626f749 100644
--- a/SourceGen/SGTestData/Expected/2011-hinting_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20070-hinting_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2011-hinting
+# 6502bench SourceGen generated linker script for 20070-hinting
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=72;
diff --git a/SourceGen/SGTestData/Expected/2012-label-localizer_64tass.S b/SourceGen/SGTestData/Expected/20081-label-localizer_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2012-label-localizer_64tass.S
rename to SourceGen/SGTestData/Expected/20081-label-localizer_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2012-label-localizer_Merlin32.S b/SourceGen/SGTestData/Expected/20081-label-localizer_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2012-label-localizer_Merlin32.S
rename to SourceGen/SGTestData/Expected/20081-label-localizer_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2012-label-localizer_acme.S b/SourceGen/SGTestData/Expected/20081-label-localizer_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2012-label-localizer_acme.S
rename to SourceGen/SGTestData/Expected/20081-label-localizer_acme.S
diff --git a/SourceGen/SGTestData/Expected/2012-label-localizer_cc65.S b/SourceGen/SGTestData/Expected/20081-label-localizer_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2012-label-localizer_cc65.S
rename to SourceGen/SGTestData/Expected/20081-label-localizer_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2012-label-localizer_cc65.cfg b/SourceGen/SGTestData/Expected/20081-label-localizer_cc65.cfg
similarity index 73%
rename from SourceGen/SGTestData/Expected/2012-label-localizer_cc65.cfg
rename to SourceGen/SGTestData/Expected/20081-label-localizer_cc65.cfg
index b86d5ff..ec96ed3 100644
--- a/SourceGen/SGTestData/Expected/2012-label-localizer_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20081-label-localizer_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2012-label-localizer
+# 6502bench SourceGen generated linker script for 20081-label-localizer
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=103;
diff --git a/SourceGen/SGTestData/Expected/2013-notes-and-comments_64tass.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2013-notes-and-comments_64tass.S
rename to SourceGen/SGTestData/Expected/20090-notes-and-comments_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2013-notes-and-comments_Merlin32.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2013-notes-and-comments_Merlin32.S
rename to SourceGen/SGTestData/Expected/20090-notes-and-comments_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2013-notes-and-comments_acme.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2013-notes-and-comments_acme.S
rename to SourceGen/SGTestData/Expected/20090-notes-and-comments_acme.S
diff --git a/SourceGen/SGTestData/Expected/2013-notes-and-comments_cc65.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2013-notes-and-comments_cc65.S
rename to SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2013-notes-and-comments_cc65.cfg b/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.cfg
similarity index 72%
rename from SourceGen/SGTestData/Expected/2013-notes-and-comments_cc65.cfg
rename to SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.cfg
index c90011e..c6d6b68 100644
--- a/SourceGen/SGTestData/Expected/2013-notes-and-comments_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2013-notes-and-comments
+# 6502bench SourceGen generated linker script for 20090-notes-and-comments
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=98;
diff --git a/SourceGen/SGTestData/Expected/2014-label-dp_64tass.S b/SourceGen/SGTestData/Expected/20102-label-dp_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2014-label-dp_64tass.S
rename to SourceGen/SGTestData/Expected/20102-label-dp_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2014-label-dp_Merlin32.S b/SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2014-label-dp_Merlin32.S
rename to SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2014-label-dp_acme.S b/SourceGen/SGTestData/Expected/20102-label-dp_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2014-label-dp_acme.S
rename to SourceGen/SGTestData/Expected/20102-label-dp_acme.S
diff --git a/SourceGen/SGTestData/Expected/2014-label-dp_cc65.S b/SourceGen/SGTestData/Expected/20102-label-dp_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2014-label-dp_cc65.S
rename to SourceGen/SGTestData/Expected/20102-label-dp_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2014-label-dp_cc65.cfg b/SourceGen/SGTestData/Expected/20102-label-dp_cc65.cfg
similarity index 80%
rename from SourceGen/SGTestData/Expected/2014-label-dp_cc65.cfg
rename to SourceGen/SGTestData/Expected/20102-label-dp_cc65.cfg
index 115f913..bccce59 100644
--- a/SourceGen/SGTestData/Expected/2014-label-dp_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20102-label-dp_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2014-label-dp
+# 6502bench SourceGen generated linker script for 20102-label-dp
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=588;
diff --git a/SourceGen/SGTestData/Expected/2015-64k-nops_64tass.S b/SourceGen/SGTestData/Expected/20110-64k-nops_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2015-64k-nops_64tass.S
rename to SourceGen/SGTestData/Expected/20110-64k-nops_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2015-64k-nops_Merlin32.S b/SourceGen/SGTestData/Expected/20110-64k-nops_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2015-64k-nops_Merlin32.S
rename to SourceGen/SGTestData/Expected/20110-64k-nops_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2015-64k-nops_acme.S b/SourceGen/SGTestData/Expected/20110-64k-nops_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2015-64k-nops_acme.S
rename to SourceGen/SGTestData/Expected/20110-64k-nops_acme.S
diff --git a/SourceGen/SGTestData/Expected/2015-64k-nops_cc65.S b/SourceGen/SGTestData/Expected/20110-64k-nops_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2015-64k-nops_cc65.S
rename to SourceGen/SGTestData/Expected/20110-64k-nops_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2015-64k-nops_cc65.cfg b/SourceGen/SGTestData/Expected/20110-64k-nops_cc65.cfg
similarity index 75%
rename from SourceGen/SGTestData/Expected/2015-64k-nops_cc65.cfg
rename to SourceGen/SGTestData/Expected/20110-64k-nops_cc65.cfg
index e82dead..d8449c9 100644
--- a/SourceGen/SGTestData/Expected/2015-64k-nops_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20110-64k-nops_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2015-64k-nops
+# 6502bench SourceGen generated linker script for 20110-64k-nops
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$0000, size=65536;
diff --git a/SourceGen/SGTestData/Expected/2016-char-encoding-a_64tass.S b/SourceGen/SGTestData/Expected/20122-char-encoding-a_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2016-char-encoding-a_64tass.S
rename to SourceGen/SGTestData/Expected/20122-char-encoding-a_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2016-char-encoding-a_Merlin32.S b/SourceGen/SGTestData/Expected/20122-char-encoding-a_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2016-char-encoding-a_Merlin32.S
rename to SourceGen/SGTestData/Expected/20122-char-encoding-a_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2016-char-encoding-a_acme.S b/SourceGen/SGTestData/Expected/20122-char-encoding-a_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2016-char-encoding-a_acme.S
rename to SourceGen/SGTestData/Expected/20122-char-encoding-a_acme.S
diff --git a/SourceGen/SGTestData/Expected/2016-char-encoding-a_cc65.S b/SourceGen/SGTestData/Expected/20122-char-encoding-a_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2016-char-encoding-a_cc65.S
rename to SourceGen/SGTestData/Expected/20122-char-encoding-a_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2016-char-encoding-a_cc65.cfg b/SourceGen/SGTestData/Expected/20122-char-encoding-a_cc65.cfg
similarity index 73%
rename from SourceGen/SGTestData/Expected/2016-char-encoding-a_cc65.cfg
rename to SourceGen/SGTestData/Expected/20122-char-encoding-a_cc65.cfg
index 1190647..990b1eb 100644
--- a/SourceGen/SGTestData/Expected/2016-char-encoding-a_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20122-char-encoding-a_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2016-char-encoding-a
+# 6502bench SourceGen generated linker script for 20122-char-encoding-a
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=1093;
diff --git a/SourceGen/SGTestData/Expected/2017-char-encoding-p_64tass.S b/SourceGen/SGTestData/Expected/20132-char-encoding-p_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2017-char-encoding-p_64tass.S
rename to SourceGen/SGTestData/Expected/20132-char-encoding-p_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2017-char-encoding-p_Merlin32.S b/SourceGen/SGTestData/Expected/20132-char-encoding-p_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2017-char-encoding-p_Merlin32.S
rename to SourceGen/SGTestData/Expected/20132-char-encoding-p_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2017-char-encoding-p_acme.S b/SourceGen/SGTestData/Expected/20132-char-encoding-p_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2017-char-encoding-p_acme.S
rename to SourceGen/SGTestData/Expected/20132-char-encoding-p_acme.S
diff --git a/SourceGen/SGTestData/Expected/2017-char-encoding-p_cc65.S b/SourceGen/SGTestData/Expected/20132-char-encoding-p_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2017-char-encoding-p_cc65.S
rename to SourceGen/SGTestData/Expected/20132-char-encoding-p_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2017-char-encoding-p_cc65.cfg b/SourceGen/SGTestData/Expected/20132-char-encoding-p_cc65.cfg
similarity index 73%
rename from SourceGen/SGTestData/Expected/2017-char-encoding-p_cc65.cfg
rename to SourceGen/SGTestData/Expected/20132-char-encoding-p_cc65.cfg
index dae67ee..62469c2 100644
--- a/SourceGen/SGTestData/Expected/2017-char-encoding-p_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20132-char-encoding-p_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2017-char-encoding-p
+# 6502bench SourceGen generated linker script for 20132-char-encoding-p
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=1093;
diff --git a/SourceGen/SGTestData/Expected/2018-char-encoding-s_64tass.S b/SourceGen/SGTestData/Expected/20142-char-encoding-s_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2018-char-encoding-s_64tass.S
rename to SourceGen/SGTestData/Expected/20142-char-encoding-s_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2018-char-encoding-s_Merlin32.S b/SourceGen/SGTestData/Expected/20142-char-encoding-s_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2018-char-encoding-s_Merlin32.S
rename to SourceGen/SGTestData/Expected/20142-char-encoding-s_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2018-char-encoding-s_acme.S b/SourceGen/SGTestData/Expected/20142-char-encoding-s_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2018-char-encoding-s_acme.S
rename to SourceGen/SGTestData/Expected/20142-char-encoding-s_acme.S
diff --git a/SourceGen/SGTestData/Expected/2018-char-encoding-s_cc65.S b/SourceGen/SGTestData/Expected/20142-char-encoding-s_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2018-char-encoding-s_cc65.S
rename to SourceGen/SGTestData/Expected/20142-char-encoding-s_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2018-char-encoding-s_cc65.cfg b/SourceGen/SGTestData/Expected/20142-char-encoding-s_cc65.cfg
similarity index 73%
rename from SourceGen/SGTestData/Expected/2018-char-encoding-s_cc65.cfg
rename to SourceGen/SGTestData/Expected/20142-char-encoding-s_cc65.cfg
index c7552ae..7af42a9 100644
--- a/SourceGen/SGTestData/Expected/2018-char-encoding-s_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20142-char-encoding-s_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2018-char-encoding-s
+# 6502bench SourceGen generated linker script for 20142-char-encoding-s
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=1093;
diff --git a/SourceGen/SGTestData/Expected/2019-local-variables_64tass.S b/SourceGen/SGTestData/Expected/20152-local-variables_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2019-local-variables_64tass.S
rename to SourceGen/SGTestData/Expected/20152-local-variables_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2019-local-variables_Merlin32.S b/SourceGen/SGTestData/Expected/20152-local-variables_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2019-local-variables_Merlin32.S
rename to SourceGen/SGTestData/Expected/20152-local-variables_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2019-local-variables_acme.S b/SourceGen/SGTestData/Expected/20152-local-variables_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2019-local-variables_acme.S
rename to SourceGen/SGTestData/Expected/20152-local-variables_acme.S
diff --git a/SourceGen/SGTestData/Expected/2019-local-variables_cc65.S b/SourceGen/SGTestData/Expected/20152-local-variables_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2019-local-variables_cc65.S
rename to SourceGen/SGTestData/Expected/20152-local-variables_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2019-local-variables_cc65.cfg b/SourceGen/SGTestData/Expected/20152-local-variables_cc65.cfg
similarity index 79%
rename from SourceGen/SGTestData/Expected/2019-local-variables_cc65.cfg
rename to SourceGen/SGTestData/Expected/20152-local-variables_cc65.cfg
index f691a70..4e4dc93 100644
--- a/SourceGen/SGTestData/Expected/2019-local-variables_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20152-local-variables_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2019-local-variables
+# 6502bench SourceGen generated linker script for 20152-local-variables
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=126;
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_64tass.S b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts-65816_64tass.S
rename to SourceGen/SGTestData/Expected/20162-cycle-counts-65816_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_Merlin32.S b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts-65816_Merlin32.S
rename to SourceGen/SGTestData/Expected/20162-cycle-counts-65816_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_acme.S b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts-65816_acme.S
rename to SourceGen/SGTestData/Expected/20162-cycle-counts-65816_acme.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.S b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.S
rename to SourceGen/SGTestData/Expected/20162-cycle-counts-65816_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.cfg b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_cc65.cfg
similarity index 72%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.cfg
rename to SourceGen/SGTestData/Expected/20162-cycle-counts-65816_cc65.cfg
index 4cc1dc5..fdb654f 100644
--- a/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2020-cycle-counts-65816
+# 6502bench SourceGen generated linker script for 20162-cycle-counts-65816
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$10f0, size=126;
diff --git a/SourceGen/SGTestData/Expected/2021-external-symbols_64tass.S b/SourceGen/SGTestData/Expected/20170-external-symbols_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2021-external-symbols_64tass.S
rename to SourceGen/SGTestData/Expected/20170-external-symbols_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2021-external-symbols_Merlin32.S b/SourceGen/SGTestData/Expected/20170-external-symbols_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2021-external-symbols_Merlin32.S
rename to SourceGen/SGTestData/Expected/20170-external-symbols_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2021-external-symbols_acme.S b/SourceGen/SGTestData/Expected/20170-external-symbols_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2021-external-symbols_acme.S
rename to SourceGen/SGTestData/Expected/20170-external-symbols_acme.S
diff --git a/SourceGen/SGTestData/Expected/2021-external-symbols_cc65.S b/SourceGen/SGTestData/Expected/20170-external-symbols_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2021-external-symbols_cc65.S
rename to SourceGen/SGTestData/Expected/20170-external-symbols_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2021-external-symbols_cc65.cfg b/SourceGen/SGTestData/Expected/20170-external-symbols_cc65.cfg
similarity index 73%
rename from SourceGen/SGTestData/Expected/2021-external-symbols_cc65.cfg
rename to SourceGen/SGTestData/Expected/20170-external-symbols_cc65.cfg
index 45f3af5..ca810ca 100644
--- a/SourceGen/SGTestData/Expected/2021-external-symbols_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20170-external-symbols_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2021-external-symbols
+# 6502bench SourceGen generated linker script for 20170-external-symbols
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=353;
diff --git a/SourceGen/SGTestData/Expected/2022-extension-scripts_64tass.S b/SourceGen/SGTestData/Expected/20182-extension-scripts_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2022-extension-scripts_64tass.S
rename to SourceGen/SGTestData/Expected/20182-extension-scripts_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2022-extension-scripts_Merlin32.S b/SourceGen/SGTestData/Expected/20182-extension-scripts_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2022-extension-scripts_Merlin32.S
rename to SourceGen/SGTestData/Expected/20182-extension-scripts_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2022-extension-scripts_acme.S b/SourceGen/SGTestData/Expected/20182-extension-scripts_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2022-extension-scripts_acme.S
rename to SourceGen/SGTestData/Expected/20182-extension-scripts_acme.S
diff --git a/SourceGen/SGTestData/Expected/2022-extension-scripts_cc65.S b/SourceGen/SGTestData/Expected/20182-extension-scripts_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2022-extension-scripts_cc65.S
rename to SourceGen/SGTestData/Expected/20182-extension-scripts_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2022-extension-scripts_cc65.cfg b/SourceGen/SGTestData/Expected/20182-extension-scripts_cc65.cfg
similarity index 82%
rename from SourceGen/SGTestData/Expected/2022-extension-scripts_cc65.cfg
rename to SourceGen/SGTestData/Expected/20182-extension-scripts_cc65.cfg
index 58efdda..fc2a598 100644
--- a/SourceGen/SGTestData/Expected/2022-extension-scripts_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20182-extension-scripts_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2022-extension-scripts
+# 6502bench SourceGen generated linker script for 20182-extension-scripts
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=512;
diff --git a/SourceGen/SGTestData/Expected/2023-non-unique-labels_64tass.S b/SourceGen/SGTestData/Expected/20190-non-unique-labels_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2023-non-unique-labels_64tass.S
rename to SourceGen/SGTestData/Expected/20190-non-unique-labels_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2023-non-unique-labels_Merlin32.S b/SourceGen/SGTestData/Expected/20190-non-unique-labels_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2023-non-unique-labels_Merlin32.S
rename to SourceGen/SGTestData/Expected/20190-non-unique-labels_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2023-non-unique-labels_acme.S b/SourceGen/SGTestData/Expected/20190-non-unique-labels_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2023-non-unique-labels_acme.S
rename to SourceGen/SGTestData/Expected/20190-non-unique-labels_acme.S
diff --git a/SourceGen/SGTestData/Expected/2023-non-unique-labels_cc65.S b/SourceGen/SGTestData/Expected/20190-non-unique-labels_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2023-non-unique-labels_cc65.S
rename to SourceGen/SGTestData/Expected/20190-non-unique-labels_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2023-non-unique-labels_cc65.cfg b/SourceGen/SGTestData/Expected/20190-non-unique-labels_cc65.cfg
similarity index 72%
rename from SourceGen/SGTestData/Expected/2023-non-unique-labels_cc65.cfg
rename to SourceGen/SGTestData/Expected/20190-non-unique-labels_cc65.cfg
index dfffc42..363f3e1 100644
--- a/SourceGen/SGTestData/Expected/2023-non-unique-labels_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20190-non-unique-labels_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2023-non-unique-labels
+# 6502bench SourceGen generated linker script for 20190-non-unique-labels
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=180;
diff --git a/SourceGen/SGTestData/Expected/2024-ui-edge-cases_64tass.S b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2024-ui-edge-cases_64tass.S
rename to SourceGen/SGTestData/Expected/20200-ui-edge-cases_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2024-ui-edge-cases_Merlin32.S b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2024-ui-edge-cases_Merlin32.S
rename to SourceGen/SGTestData/Expected/20200-ui-edge-cases_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2024-ui-edge-cases_acme.S b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2024-ui-edge-cases_acme.S
rename to SourceGen/SGTestData/Expected/20200-ui-edge-cases_acme.S
diff --git a/SourceGen/SGTestData/Expected/2024-ui-edge-cases_cc65.S b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2024-ui-edge-cases_cc65.S
rename to SourceGen/SGTestData/Expected/20200-ui-edge-cases_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2024-ui-edge-cases_cc65.cfg b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_cc65.cfg
similarity index 83%
rename from SourceGen/SGTestData/Expected/2024-ui-edge-cases_cc65.cfg
rename to SourceGen/SGTestData/Expected/20200-ui-edge-cases_cc65.cfg
index 114145f..823fa3d 100644
--- a/SourceGen/SGTestData/Expected/2024-ui-edge-cases_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2024-ui-edge-cases
+# 6502bench SourceGen generated linker script for 20200-ui-edge-cases
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$2000, size=10;
diff --git a/SourceGen/SGTestData/Source/2005-string-types.S b/SourceGen/SGTestData/Source/20010-string-types.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2005-string-types.S
rename to SourceGen/SGTestData/Source/20010-string-types.S
diff --git a/SourceGen/SGTestData/Source/2006-operand-formats.S b/SourceGen/SGTestData/Source/20022-operand-formats.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2006-operand-formats.S
rename to SourceGen/SGTestData/Source/20022-operand-formats.S
diff --git a/SourceGen/SGTestData/Source/2007-labels-and-symbols.S b/SourceGen/SGTestData/Source/20032-labels-and-symbols.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2007-labels-and-symbols.S
rename to SourceGen/SGTestData/Source/20032-labels-and-symbols.S
diff --git a/SourceGen/SGTestData/Source/2008-address-changes.S b/SourceGen/SGTestData/Source/20042-address-changes.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2008-address-changes.S
rename to SourceGen/SGTestData/Source/20042-address-changes.S
diff --git a/SourceGen/SGTestData/Source/2009-branches-and-banks.S b/SourceGen/SGTestData/Source/20052-branches-and-banks.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2009-branches-and-banks.S
rename to SourceGen/SGTestData/Source/20052-branches-and-banks.S
diff --git a/SourceGen/SGTestData/Source/2009-branches-and-banks.cfg b/SourceGen/SGTestData/Source/20052-branches-and-banks.cfg
similarity index 100%
rename from SourceGen/SGTestData/Source/2009-branches-and-banks.cfg
rename to SourceGen/SGTestData/Source/20052-branches-and-banks.cfg
diff --git a/SourceGen/SGTestData/Source/2010-target-adjustment.S b/SourceGen/SGTestData/Source/20062-target-adjustment.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2010-target-adjustment.S
rename to SourceGen/SGTestData/Source/20062-target-adjustment.S
diff --git a/SourceGen/SGTestData/Source/2011-hinting.S b/SourceGen/SGTestData/Source/20070-hinting.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2011-hinting.S
rename to SourceGen/SGTestData/Source/20070-hinting.S
diff --git a/SourceGen/SGTestData/Source/2012-label-localizer.S b/SourceGen/SGTestData/Source/20081-label-localizer.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2012-label-localizer.S
rename to SourceGen/SGTestData/Source/20081-label-localizer.S
diff --git a/SourceGen/SGTestData/Source/2013-notes-and-comments.S b/SourceGen/SGTestData/Source/20090-notes-and-comments.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2013-notes-and-comments.S
rename to SourceGen/SGTestData/Source/20090-notes-and-comments.S
diff --git a/SourceGen/SGTestData/Source/2014-label-dp.S b/SourceGen/SGTestData/Source/20102-label-dp.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2014-label-dp.S
rename to SourceGen/SGTestData/Source/20102-label-dp.S
diff --git a/SourceGen/SGTestData/Source/2016-char-encoding.S b/SourceGen/SGTestData/Source/20122-char-encoding.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2016-char-encoding.S
rename to SourceGen/SGTestData/Source/20122-char-encoding.S
diff --git a/SourceGen/SGTestData/Source/2019-local-variables.S b/SourceGen/SGTestData/Source/20152-local-variables.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2019-local-variables.S
rename to SourceGen/SGTestData/Source/20152-local-variables.S
diff --git a/SourceGen/SGTestData/Source/2020-cycle-counts-65816.S b/SourceGen/SGTestData/Source/20162-cycle-counts-65816.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2020-cycle-counts-65816.S
rename to SourceGen/SGTestData/Source/20162-cycle-counts-65816.S
diff --git a/SourceGen/SGTestData/Source/2021-external-symbols.S b/SourceGen/SGTestData/Source/20170-external-symbols.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2021-external-symbols.S
rename to SourceGen/SGTestData/Source/20170-external-symbols.S
diff --git a/SourceGen/SGTestData/Source/2022-extension-scripts.S b/SourceGen/SGTestData/Source/20182-extension-scripts.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2022-extension-scripts.S
rename to SourceGen/SGTestData/Source/20182-extension-scripts.S
diff --git a/SourceGen/SGTestData/Source/2023-non-unique-labels.S b/SourceGen/SGTestData/Source/20190-non-unique-labels.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2023-non-unique-labels.S
rename to SourceGen/SGTestData/Source/20190-non-unique-labels.S
diff --git a/SourceGen/SGTestData/Source/2024-ui-edge-cases.S b/SourceGen/SGTestData/Source/20200-ui-edge-cases.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2024-ui-edge-cases.S
rename to SourceGen/SGTestData/Source/20200-ui-edge-cases.S