v2x: Fix the case in the tests.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
diff --git a/tests/clocks/dff_comb_one_clock/golden.model.xml b/tests/clocks/dff_comb_one_clock/golden.model.xml
index c6cdb09..dab8f40 100644
--- a/tests/clocks/dff_comb_one_clock/golden.model.xml
+++ b/tests/clocks/dff_comb_one_clock/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a" is_clock="1" />
       <port name="b" combinational_sink_ports="d" clock="a" />
diff --git a/tests/clocks/dff_one_clock/golden.model.xml b/tests/clocks/dff_one_clock/golden.model.xml
index 7e1ab49..f582f0b 100644
--- a/tests/clocks/dff_one_clock/golden.model.xml
+++ b/tests/clocks/dff_one_clock/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a" is_clock="1" />
       <port name="b" clock="a" />
diff --git a/tests/clocks/dff_two_clocks/golden.model.xml b/tests/clocks/dff_two_clocks/golden.model.xml
index 8a6eb84..1ca3456 100644
--- a/tests/clocks/dff_two_clocks/golden.model.xml
+++ b/tests/clocks/dff_two_clocks/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port clock="c1" combinational_sink_ports="o1" name="a"/>
       <port clock="c2 c1" combinational_sink_ports="o2 o1" name="b"/>
diff --git a/tests/clocks/input_attr_clock/golden.model.xml b/tests/clocks/input_attr_clock/golden.model.xml
index b4d4680..91bc492 100644
--- a/tests/clocks/input_attr_clock/golden.model.xml
+++ b/tests/clocks/input_attr_clock/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a" is_clock="1" />
       <port name="b"/>
diff --git a/tests/clocks/input_named_clk/golden.model.xml b/tests/clocks/input_named_clk/golden.model.xml
index 7a3dbc0..bdf49fb 100644
--- a/tests/clocks/input_named_clk/golden.model.xml
+++ b/tests/clocks/input_named_clk/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a"/>
       <port name="clk" is_clock="1" />
diff --git a/tests/clocks/input_named_rdclk/golden.model.xml b/tests/clocks/input_named_rdclk/golden.model.xml
index 7b3613c..26faddf 100644
--- a/tests/clocks/input_named_rdclk/golden.model.xml
+++ b/tests/clocks/input_named_rdclk/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a"/>
       <port name="rdclk" is_clock="1" />
diff --git a/tests/clocks/multiple_inputs_named_clk/golden.model.xml b/tests/clocks/multiple_inputs_named_clk/golden.model.xml
index 7fe6e68..a0625c3 100644
--- a/tests/clocks/multiple_inputs_named_clk/golden.model.xml
+++ b/tests/clocks/multiple_inputs_named_clk/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a"/>
       <port name="b"/>
diff --git a/tests/clocks/multiple_outputs_named_clk/golden.model.xml b/tests/clocks/multiple_outputs_named_clk/golden.model.xml
index 84cf151..dff333d 100644
--- a/tests/clocks/multiple_outputs_named_clk/golden.model.xml
+++ b/tests/clocks/multiple_outputs_named_clk/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a"/>
       <port name="b"/>
diff --git a/tests/clocks/output_attr_clock/golden.model.xml b/tests/clocks/output_attr_clock/golden.model.xml
index 8a49b98..cd2a735 100644
--- a/tests/clocks/output_attr_clock/golden.model.xml
+++ b/tests/clocks/output_attr_clock/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a" />
       <port name="b"/>
diff --git a/tests/clocks/output_named_clk/golden.model.xml b/tests/clocks/output_named_clk/golden.model.xml
index 86f4ad7..5c534ca 100644
--- a/tests/clocks/output_named_clk/golden.model.xml
+++ b/tests/clocks/output_named_clk/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a"/>
       <port name="b" />
diff --git a/tests/clocks/output_named_rdclk/golden.model.xml b/tests/clocks/output_named_rdclk/golden.model.xml
index 442496e..b0fa908 100644
--- a/tests/clocks/output_named_rdclk/golden.model.xml
+++ b/tests/clocks/output_named_rdclk/golden.model.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <models>
-  <model name="block">
+  <model name="BLOCK">
     <input_ports>
       <port name="a"/>
       <port name="b"/>
diff --git a/tests/dsp_combinational/golden.model.xml b/tests/dsp_combinational/golden.model.xml
index eab765a..f958147 100644
--- a/tests/dsp_combinational/golden.model.xml
+++ b/tests/dsp_combinational/golden.model.xml
@@ -1,6 +1,6 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#sequential-block-no-internal-paths -->
-  <model name="dsp_combinational">
+  <model name="DSP_COMBINATIONAL">
     <input_ports>
       <port name="a" combinational_sink_ports="out"/>
       <port name="b" combinational_sink_ports="out"/>
diff --git a/tests/dsp_combinational/golden.pb_type.xml b/tests/dsp_combinational/golden.pb_type.xml
index e1c8d3d..aad9b8a 100644
--- a/tests/dsp_combinational/golden.pb_type.xml
+++ b/tests/dsp_combinational/golden.pb_type.xml
@@ -1,4 +1,4 @@
-<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="dsp_combinational" blif_model=".subckt dsp_combinational" num_pb="1">
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="DSP_COMBINATIONAL" blif_model=".subckt DSP_COMBINATIONAL" num_pb="1">
   <input name="a" num_pins="32"/>
   <input name="b" num_pins="32"/>
   <input name="m" num_pins="1"/>
diff --git a/tests/dsp_in_registered/golden.model.xml b/tests/dsp_in_registered/golden.model.xml
index 087352c..13ec296 100644
--- a/tests/dsp_in_registered/golden.model.xml
+++ b/tests/dsp_in_registered/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <xi:include href="../fig42-dff/dff.model.xml" xpointer="xpointer(models/child::node())"/>
-  <model name="dsp_in_registered">
+  <model name="DSP_IN_REGISTERED">
     <input_ports>
       <port clock="clk" combinational_sink_ports="out" name="a"/>
       <port clock="clk" combinational_sink_ports="out" name="b"/>
diff --git a/tests/dsp_inout_registered/golden.model.xml b/tests/dsp_inout_registered/golden.model.xml
index f837ec9..aecfeec 100644
--- a/tests/dsp_inout_registered/golden.model.xml
+++ b/tests/dsp_inout_registered/golden.model.xml
@@ -2,7 +2,7 @@
   <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <xi:include href="../fig42-dff/dff.model.xml" xpointer="xpointer(models/child::node())"/>
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
-  <model name="dsp_inout_registered">
+  <model name="DSP_INOUT_REGISTERED">
     <input_ports>
       <port name="a" combinational_sink_ports="out" clock="clk"/>
       <port name="b" combinational_sink_ports="out" clock="clk"/>
diff --git a/tests/dsp_inout_registered_dualclk/golden.model.xml b/tests/dsp_inout_registered_dualclk/golden.model.xml
index 51dfd45..8ab0f30 100644
--- a/tests/dsp_inout_registered_dualclk/golden.model.xml
+++ b/tests/dsp_inout_registered_dualclk/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <xi:include href="../fig42-dff/dff.model.xml" xpointer="xpointer(models/child::node())"/>
-  <model name="dsp_inout_registered_dualclk">
+  <model name="DSP_INOUT_REGISTERED_DUALCLK">
     <input_ports>
       <port clock="oclk iclk" combinational_sink_ports="out" name="a"/>
       <port clock="oclk iclk" combinational_sink_ports="out" name="b"/>
diff --git a/tests/dsp_modes/golden.model.xml b/tests/dsp_modes/golden.model.xml
index dc5b4e9..5efc49a 100644
--- a/tests/dsp_modes/golden.model.xml
+++ b/tests/dsp_modes/golden.model.xml
@@ -1,7 +1,7 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <xi:include href="../dsp_inout_registered/dsp_inout_registered.model.xml" xpointer="xpointer(models/child::node())"/>
-  <model name="dsp_modes">
+  <model name="DSP_MODES">
     <input_ports>
       <port clock="clk" combinational_sink_ports="out" name="a"/>
       <port clock="clk" combinational_sink_ports="out" name="b"/>
diff --git a/tests/dsp_out_registered/golden.pb_type.xml b/tests/dsp_out_registered/golden.pb_type.xml
index ccfb7e1..d295d5c 100644
--- a/tests/dsp_out_registered/golden.pb_type.xml
+++ b/tests/dsp_out_registered/golden.pb_type.xml
@@ -5,10 +5,10 @@
   <clock name="clk" num_pins="1"/>
   <input name="m" num_pins="1"/>
   <output name="out" num_pins="64"/>
-  <pb_type blif_model=".subckt dsp_combinational" name="dsp_combinational" num_pb="1">
+  <pb_type blif_model=".subckt DSP_COMBINATIONAL" name="dsp_combinational" num_pb="1">
     <xi:include href="../dsp_combinational/dsp_combinational.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/>
   </pb_type>
-  <pb_type blif_model=".subckt dff" name="dff" num_pb="64">
+  <pb_type blif_model=".subckt DFF" name="dff" num_pb="64">
     <xi:include href="../fig42-dff/dff.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/>
   </pb_type>
   <interconnect>
diff --git a/tests/dsp_partial_registered/golden.model.xml b/tests/dsp_partial_registered/golden.model.xml
index 8cb179c..a92bdca 100644
--- a/tests/dsp_partial_registered/golden.model.xml
+++ b/tests/dsp_partial_registered/golden.model.xml
@@ -2,7 +2,7 @@
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#mixed-sequential-combinational-block -->
   <xi:include href="../dsp_combinational/dsp_combinational.model.xml" xpointer="xpointer(models/child::node())"/>
   <xi:include href="../fig42-dff/dff.model.xml" xpointer="xpointer(models/child::node())"/>
-  <model name="dsp_partial_registered">
+  <model name="DSP_PARTIAL_REGISTERED">
     <input_ports>
       <port name="a" combinational_sink_ports="out" clock="clk"/>
       <port name="b" combinational_sink_ports="out" clock="clk"/>
diff --git a/tests/fig41-full-adder/golden.model.xml b/tests/fig41-full-adder/golden.model.xml
index 5ac3aef..1aa88d8 100644
--- a/tests/fig41-full-adder/golden.model.xml
+++ b/tests/fig41-full-adder/golden.model.xml
@@ -1,6 +1,6 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#sequential-block-no-internal-paths -->
-  <model name="adder">
+  <model name="ADDER">
     <input_ports>
       <port name="a" combinational_sink_ports="cout sum"/>
       <port name="b" combinational_sink_ports="cout sum"/>
diff --git a/tests/fig41-full-adder/golden.pb_type.xml b/tests/fig41-full-adder/golden.pb_type.xml
index 5b44106..d6b50e8 100644
--- a/tests/fig41-full-adder/golden.pb_type.xml
+++ b/tests/fig41-full-adder/golden.pb_type.xml
@@ -1,4 +1,4 @@
-<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="ADDER" blif_model=".subckt adder" num_pb="1">
+<pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="ADDER" blif_model=".subckt ADDER" num_pb="1">
   <input name="a" num_pins="1"/>
   <input name="b" num_pins="1"/>
   <input name="cin" num_pins="1"/>
diff --git a/tests/fig42-dff/golden.model.xml b/tests/fig42-dff/golden.model.xml
index afeaaca..e23a72c 100644
--- a/tests/fig42-dff/golden.model.xml
+++ b/tests/fig42-dff/golden.model.xml
@@ -1,6 +1,6 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- https://docs.verilogtorouting.org/en/latest/tutorials/arch/timing_modeling/#sequential-block-no-internal-paths -->
-  <model name="dff">
+  <model name="DFF">
     <input_ports>
       <port name="clk" is_clock="1"/>
       <port name="d" clock="clk"/>
diff --git a/tests/simple_pll/golden.model.xml b/tests/simple_pll/golden.model.xml
index 356e686..3bd53f5 100644
--- a/tests/simple_pll/golden.model.xml
+++ b/tests/simple_pll/golden.model.xml
@@ -1,5 +1,5 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
-  <model name="simple_pll">
+  <model name="SIMPLE_PLL">
     <input_ports>
       <port name="in_clock" is_clock="1"/>
     </input_ports>