diff --git a/eeschema/sim/sim_model.h b/eeschema/sim/sim_model.h
index a0c43a4b9d..dd33c28b3e 100644
--- a/eeschema/sim/sim_model.h
+++ b/eeschema/sim/sim_model.h
@@ -54,11 +54,11 @@ public:
     static constexpr auto REFERENCE_FIELD = "Reference";
     static constexpr auto VALUE_FIELD = "Value";
 
-    static constexpr auto DEVICE_TYPE_FIELD = "Sim_Device";
-    static constexpr auto TYPE_FIELD = "Sim_Type";
-    static constexpr auto PINS_FIELD = "Sim_Pins";
-    static constexpr auto PARAMS_FIELD = "Sim_Params";
-    static constexpr auto ENABLE_FIELD = "Sim_Enable";
+    static constexpr auto DEVICE_TYPE_FIELD = "Sim.Device";
+    static constexpr auto TYPE_FIELD = "Sim.Type";
+    static constexpr auto PINS_FIELD = "Sim.Pins";
+    static constexpr auto PARAMS_FIELD = "Sim.Params";
+    static constexpr auto ENABLE_FIELD = "Sim.Enable";
 
 
     // There's a trailing '_' because `DEVICE_TYPE` collides with something in Windows headers.
diff --git a/eeschema/sim/sim_serde.h b/eeschema/sim/sim_serde.h
index e01829108b..6ab1773ac5 100644
--- a/eeschema/sim/sim_serde.h
+++ b/eeschema/sim/sim_serde.h
@@ -133,11 +133,11 @@ public:
     static constexpr auto REFERENCE_FIELD = "Reference";
     static constexpr auto VALUE_FIELD = "Value";
 
-    static constexpr auto DEVICE_TYPE_FIELD = "Sim_Device";
-    static constexpr auto TYPE_FIELD = "Sim_Type";
-    static constexpr auto PINS_FIELD = "Sim_Pins";
-    static constexpr auto PARAMS_FIELD = "Sim_Params";
-    static constexpr auto ENABLE_FIELD = "Sim_Enable";
+    static constexpr auto DEVICE_TYPE_FIELD = "Sim.Device";
+    static constexpr auto TYPE_FIELD = "Sim.Type";
+    static constexpr auto PINS_FIELD = "Sim.Pins";
+    static constexpr auto PARAMS_FIELD = "Sim.Params";
+    static constexpr auto ENABLE_FIELD = "Sim.Enable";
 
     SIM_SERDE( SIM_MODEL& aModel ) : m_model( aModel ) {}
 
diff --git a/qa/data/eeschema/spice_netlists/chirp/chirp.kicad_sch b/qa/data/eeschema/spice_netlists/chirp/chirp.kicad_sch
index cae87894f0..13d66ef75b 100644
--- a/qa/data/eeschema/spice_netlists/chirp/chirp.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/chirp/chirp.kicad_sch
@@ -152,13 +152,13 @@
     (property "Sim_Library" "chirp.lib.spice" (id 5) (at 165.1 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SUBCKT" (id 6) (at 165.1 119.38 0)
+    (property "Sim.Device" "SUBCKT" (id 6) (at 165.1 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "bf=1k ef=3k bt=30m et=70m" (id 7) (at 165.1 119.38 0)
+    (property "Sim.Params" "bf=1k ef=3k bt=30m et=70m" (id 7) (at 165.1 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (id 8) (at 165.1 119.38 0)
+    (property "Sim.Pins" "1 2" (id 8) (at 165.1 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 69509f58-8756-4cec-83fa-cd042c171c7a))
diff --git a/qa/data/eeschema/spice_netlists/cmos_not/cmos_not.kicad_sch b/qa/data/eeschema/spice_netlists/cmos_not/cmos_not.kicad_sch
index 92c6c55256..02fb408d51 100644
--- a/qa/data/eeschema/spice_netlists/cmos_not/cmos_not.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/cmos_not/cmos_not.kicad_sch
@@ -601,7 +601,7 @@
     (property "Reference" "VIN1" (at 118.11 107.95 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 118.11 110.49 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 118.11 110.49 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 114.3 107.95 0)
@@ -610,13 +610,13 @@
     (property "Datasheet" "~" (at 114.3 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 107.95 0)
+    (property "Sim.Device" "V" (at 114.3 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "SIN" (at 114.3 107.95 0)
+    (property "Sim.Type" "SIN" (at 114.3 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "dc=2.5 ampl=2.5 f=1k" (at 129.54 113.03 0)
+    (property "Sim.Params" "dc=2.5 ampl=2.5 f=1k" (at 129.54 113.03 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid caf5bcc4-a42f-4b60-b1a8-22e72909f97a))
@@ -624,7 +624,7 @@
     (instances
       (project "cmos_not"
         (path "/569fb493-5024-4abd-9aba-73198e12c7f2"
-          (reference "VIN1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "VIN1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -670,7 +670,7 @@
     (property "Datasheet" "~" (at 165.1 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 165.1 107.95 0)
+    (property "Sim.Device" "R" (at 165.1 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2f230156-e43a-4ffc-bfcb-5ad7a95b7eed))
@@ -699,13 +699,13 @@
     (property "Datasheet" "~" (at 88.9 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 88.9 107.95 0)
+    (property "Sim.Device" "V" (at 88.9 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 88.9 107.95 0)
+    (property "Sim.Pins" "1 2" (at 88.9 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "dc=5" (at 88.9 107.95 0)
+    (property "Sim.Params" "dc=5" (at 88.9 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 56899bdb-9863-4906-be1d-e9bb08728b22))
@@ -790,16 +790,16 @@
     (property "Sim_Library" "cmos_not.lib.spice" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (at 149.86 95.25 0)
+    (property "Sim.Device" "PMOS" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS1" (at 149.86 95.25 0)
+    (property "Sim.Type" "MOS1" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (at 149.86 95.25 0)
+    (property "Sim.Pins" "1 2 3 4" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1u w=1.4u" (at 149.86 95.25 0)
+    (property "Sim.Params" "l=1u w=1.4u" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7bcb579b-80ed-4fb7-8b71-8a99bb3f6676))
@@ -886,16 +886,16 @@
     (property "Sim_Library" "cmos_not.lib.spice" (at 149.86 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (at 149.86 107.95 0)
+    (property "Sim.Device" "NMOS" (at 149.86 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS1" (at 149.86 107.95 0)
+    (property "Sim.Type" "MOS1" (at 149.86 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (at 149.86 107.95 0)
+    (property "Sim.Pins" "1 2 3 4" (at 149.86 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1u w=1u" (at 149.86 107.95 0)
+    (property "Sim.Params" "l=1u w=1u" (at 149.86 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e2b5a27e-4687-4bdb-851b-931f64e28381))
diff --git a/qa/data/eeschema/spice_netlists/directives/directives.kicad_sch b/qa/data/eeschema/spice_netlists/directives/directives.kicad_sch
index e817af316a..0558c11618 100644
--- a/qa/data/eeschema/spice_netlists/directives/directives.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/directives/directives.kicad_sch
@@ -409,7 +409,7 @@
     (property "Datasheet" "~" (at 114.3 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 107.95 0)
+    (property "Sim.Device" "V" (at 114.3 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a16c3b98-7b67-49c9-8b37-b5d5ca2ceccb))
@@ -438,7 +438,7 @@
     (property "Datasheet" "~" (at 165.1 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 165.1 82.55 0)
+    (property "Sim.Device" "R" (at 165.1 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f3a7863c-6d15-47c4-8c18-821cab9870f0))
@@ -467,13 +467,13 @@
     (property "Datasheet" "~" (at 127 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SPICE" (at 127 107.95 0)
+    (property "Sim.Device" "SPICE" (at 127 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 127 107.95 0)
+    (property "Sim.Pins" "1 2" (at 127 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "type=X model=RESISTOR" (at 127 107.95 0)
+    (property "Sim.Params" "type=X model=RESISTOR" (at 127 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1f696691-a52a-4cb4-8b3c-ccee759deace))
@@ -577,7 +577,7 @@
     (property "Datasheet" "~" (at 152.4 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "L" (at 152.4 82.55 0)
+    (property "Sim.Device" "L" (at 152.4 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a53583dc-95c8-4fca-91b3-9355c491ff8e))
@@ -606,7 +606,7 @@
     (property "Datasheet" "~" (at 139.7 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "L" (at 139.7 82.55 0)
+    (property "Sim.Device" "L" (at 139.7 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0fe84496-e0c8-4141-8960-8b9cae8d2390))
@@ -626,7 +626,7 @@
     (property "Reference" "V1" (at 118.11 81.915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 118.11 84.455 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 118.11 84.455 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 114.3 82.55 0)
@@ -635,13 +635,13 @@
     (property "Datasheet" "~" (at 114.3 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 82.55 0)
+    (property "Sim.Device" "V" (at 114.3 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "SIN" (at 114.3 82.55 0)
+    (property "Sim.Type" "SIN" (at 114.3 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "ampl=1 f=1k" (at 114.3 82.55 0)
+    (property "Sim.Params" "ampl=1 f=1k" (at 114.3 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 97129dd6-9c66-4077-b4e0-36ed8a999d2a))
@@ -649,7 +649,7 @@
     (instances
       (project "directives"
         (path "/a442c838-4dd5-4486-8afe-ccab26ad4148"
-          (reference "V1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "V1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
diff --git a/qa/data/eeschema/spice_netlists/fliege_filter/fliege_filter.kicad_sch b/qa/data/eeschema/spice_netlists/fliege_filter/fliege_filter.kicad_sch
index 8cb59b019c..3b41c98ee6 100644
--- a/qa/data/eeschema/spice_netlists/fliege_filter/fliege_filter.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/fliege_filter/fliege_filter.kicad_sch
@@ -591,10 +591,10 @@
     (property "Sim_Library" "uopamp.lib.spice" (at 185.42 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SUBCKT" (at 185.42 91.44 0)
+    (property "Sim.Device" "SUBCKT" (at 185.42 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "8 4 3 2 1 5 6 7" (at 154.94 91.44 0)
+    (property "Sim.Pins" "8 4 3 2 1 5 6 7" (at 154.94 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0a29384e-5eae-4f6a-8dd8-bcb7fde77582))
@@ -654,7 +654,7 @@
     (property "Datasheet" "~" (at 146.05 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 146.05 101.6 90)
+    (property "Sim.Device" "R" (at 146.05 101.6 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 40f49b82-6de7-4c0a-9ce9-c928e90dcee8))
@@ -733,7 +733,7 @@
     (property "Datasheet" "~" (at 196.85 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 196.85 133.35 0)
+    (property "Sim.Device" "R" (at 196.85 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 083905bc-5d2a-4620-b997-d57f2d5bc810))
@@ -762,7 +762,7 @@
     (property "Datasheet" "~" (at 114.3 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 133.35 0)
+    (property "Sim.Device" "V" (at 114.3 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d23993af-9614-478b-984f-e6808785e08a))
@@ -791,7 +791,7 @@
     (property "Datasheet" "~" (at 184.15 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 184.15 101.6 90)
+    (property "Sim.Device" "R" (at 184.15 101.6 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b939b2fc-aa38-4699-b76d-3476fb7b1b91))
@@ -826,10 +826,10 @@
     (property "Sim_Library" "uopamp.lib.spice" (at 185.42 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SUBCKT" (at 185.42 149.86 0)
+    (property "Sim.Device" "SUBCKT" (at 185.42 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "8 4 3 2 1 5 6 7" (at 185.42 149.86 0)
+    (property "Sim.Pins" "8 4 3 2 1 5 6 7" (at 185.42 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5299360d-4e38-4601-9b73-8e19e0ac8f7e))
@@ -864,7 +864,7 @@
     (property "Datasheet" "~" (at 114.3 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 95.25 0)
+    (property "Sim.Device" "V" (at 114.3 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d18a7be3-befb-4f82-9812-85b576c6ba5e))
@@ -893,7 +893,7 @@
     (property "Datasheet" "~" (at 171.45 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 171.45 101.6 90)
+    (property "Sim.Device" "C" (at 171.45 101.6 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 701a271c-8e57-419b-a6f9-2cfcaf4ee7b0))
@@ -922,7 +922,7 @@
     (property "Datasheet" "~" (at 114.3 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 120.65 0)
+    (property "Sim.Device" "V" (at 114.3 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d2a7eba0-60d5-4840-8c92-caa7d1cde951))
@@ -957,10 +957,10 @@
     (property "Sim_Library" "uopamp.lib.spice" (at 185.42 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SUBCKT" (at 185.42 91.44 0)
+    (property "Sim.Device" "SUBCKT" (at 185.42 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "8 4 3 2 1 5 6 7" (at 185.42 91.44 0)
+    (property "Sim.Pins" "8 4 3 2 1 5 6 7" (at 185.42 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid dd60fb5d-009c-4abb-9bfa-85c9da58e712))
@@ -995,7 +995,7 @@
     (property "Datasheet" "~" (at 158.75 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 158.75 95.25 0)
+    (property "Sim.Device" "R" (at 158.75 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0f79286a-8c35-4ebd-bb87-7c2598c14e47))
@@ -1024,7 +1024,7 @@
     (property "Datasheet" "~" (at 146.05 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 146.05 88.9 90)
+    (property "Sim.Device" "C" (at 146.05 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 390f428e-6f41-4201-872f-ad881ee3dac9))
@@ -1053,7 +1053,7 @@
     (property "Datasheet" "~" (at 196.85 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 196.85 107.95 0)
+    (property "Sim.Device" "R" (at 196.85 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 17e2e487-1812-4496-ab4b-2a31981593f1))
@@ -1082,7 +1082,7 @@
     (property "Datasheet" "~" (at 152.4 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 152.4 107.95 0)
+    (property "Sim.Device" "R" (at 152.4 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0641ce34-fa4f-4111-a092-55b991bc6841))
diff --git a/qa/data/eeschema/spice_netlists/instance_params/instance_params.kicad_sch b/qa/data/eeschema/spice_netlists/instance_params/instance_params.kicad_sch
index bef4411ad1..fb4320579d 100644
--- a/qa/data/eeschema/spice_netlists/instance_params/instance_params.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/instance_params/instance_params.kicad_sch
@@ -1178,13 +1178,13 @@
     (property "Datasheet" "~" (id 3) (at 199.39 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 199.39 31.75 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 199.39 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HISIM2" (id 5) (at 199.39 31.75 0)
+    (property "Sim.Type" "HISIM2" (id 5) (at 199.39 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 199.39 31.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 199.39 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_HISIM2" (id 8) (at 199.39 31.75 0)
@@ -1193,7 +1193,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 199.39 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 199.39 31.75 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 199.39 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ccca9090-c08d-4493-90b5-00d5e92ac060))
@@ -1224,16 +1224,16 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 5) (at 269.24 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PNP" (id 6) (at 269.24 63.5 0)
+    (property "Sim.Device" "PNP" (id 6) (at 269.24 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "VBIC" (id 7) (at 269.24 63.5 0)
+    (property "Sim.Type" "VBIC" (id 7) (at 269.24 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (id 8) (at 269.24 63.5 0)
+    (property "Sim.Pins" "1 2 3" (id 8) (at 269.24 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 area=2" (id 10) (at 269.24 63.5 0)
+    (property "Sim.Params" "m=1 area=2" (id 10) (at 269.24 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 57855ef4-5890-4f46-a068-44a79c4a4045))
@@ -1315,13 +1315,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 160.02 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIDD" (id 5) (at 104.14 160.02 0)
+    (property "Sim.Type" "B3SOIDD" (id 5) (at 104.14 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 160.02 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_B3SOIDD" (id 8) (at 104.14 160.02 0)
@@ -1330,7 +1330,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2" (id 10) (at 104.14 160.02 0)
+    (property "Sim.Params" "l=1 w=2" (id 10) (at 104.14 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4badbdae-7531-419d-a466-7503eadc70bb))
@@ -1393,13 +1393,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 57.15 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS9" (id 5) (at 104.14 57.15 0)
+    (property "Sim.Type" "MOS9" (id 5) (at 104.14 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 57.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_MOS9" (id 8) (at 104.14 57.15 0)
@@ -1408,7 +1408,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 57.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 56864c12-d035-4a7c-b678-bf5fa3961642))
@@ -1472,7 +1472,7 @@
     (property "Datasheet" "~" (id 3) (at 71.12 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 71.12 107.95 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 71.12 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_BSIM1" (id 6) (at 71.12 107.95 0)
@@ -1481,13 +1481,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 7) (at 71.12 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM1" (id 8) (at 71.12 107.95 0)
+    (property "Sim.Type" "BSIM1" (id 8) (at 71.12 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 9) (at 71.12 107.95 0)
+    (property "Sim.Pins" "1 2 3 4" (id 9) (at 71.12 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 107.95 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b3f550d5-8ed3-46a7-9906-6222dac08c3e))
@@ -1531,7 +1531,7 @@
     (property "Datasheet" "~" (id 3) (at 40.005 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 40.64 158.75 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 40.64 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_MOS6" (id 6) (at 40.64 158.75 0)
@@ -1540,13 +1540,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 7) (at 40.64 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS6" (id 8) (at 40.64 158.75 0)
+    (property "Sim.Type" "MOS6" (id 8) (at 40.64 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 9) (at 40.64 158.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 9) (at 40.64 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 158.75 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c8bd12e0-2294-4155-91cc-ce07968f6459))
@@ -1571,13 +1571,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 31.75 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM3" (id 5) (at 135.89 31.75 0)
+    (property "Sim.Type" "BSIM3" (id 5) (at 135.89 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 31.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_BSIM3" (id 8) (at 135.89 31.75 0)
@@ -1586,7 +1586,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 135.89 31.75 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 135.89 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid caaa40cf-ddfc-4099-b171-b1d4cf641ddb))
@@ -1690,13 +1690,13 @@
     (property "Datasheet" "~" (id 3) (at 199.39 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 199.39 57.15 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 199.39 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIPD" (id 5) (at 199.39 57.15 0)
+    (property "Sim.Type" "B3SOIPD" (id 5) (at 199.39 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 199.39 57.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 199.39 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_B3SOIPD" (id 8) (at 199.39 57.15 0)
@@ -1705,7 +1705,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 199.39 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 199.39 57.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 199.39 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 47cda647-de6c-4587-8060-fc4b15bc0c36))
@@ -1787,7 +1787,7 @@
     (property "Datasheet" "~" (id 3) (at 40.005 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 40.64 57.15 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 40.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_MOS2" (id 6) (at 40.64 57.15 0)
@@ -1796,13 +1796,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 7) (at 40.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS2" (id 8) (at 40.64 57.15 0)
+    (property "Sim.Type" "MOS2" (id 8) (at 40.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 9) (at 40.64 57.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 9) (at 40.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 40.64 57.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 40.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c261aedb-865e-4a0f-8948-2b22c3396a4c))
@@ -1872,13 +1872,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 5) (at 237.49 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NPN" (id 6) (at 237.49 95.25 0)
+    (property "Sim.Device" "NPN" (id 6) (at 237.49 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HICUML2" (id 7) (at 237.49 95.25 0)
+    (property "Sim.Type" "HICUML2" (id 7) (at 237.49 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (id 8) (at 237.49 95.25 0)
+    (property "Sim.Pins" "1 2 3" (id 8) (at 237.49 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Disabled" "1" (id 9) (at 237.49 95.25 0)
@@ -1982,13 +1982,13 @@
     (property "Datasheet" "~" (id 3) (at 40.005 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 40.64 82.55 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 40.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS3" (id 5) (at 40.64 82.55 0)
+    (property "Sim.Type" "MOS3" (id 5) (at 40.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 40.64 82.55 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 40.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_MOS3" (id 8) (at 40.64 82.55 0)
@@ -1997,7 +1997,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 40.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 82.55 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ce082058-c94d-4966-9198-9bf54ce62a6b))
@@ -2273,7 +2273,7 @@
     (property "Datasheet" "~" (id 3) (at 71.12 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 71.12 158.75 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 71.12 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_MOS6" (id 6) (at 71.12 158.75 0)
@@ -2282,13 +2282,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 7) (at 71.12 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS6" (id 8) (at 71.12 158.75 0)
+    (property "Sim.Type" "MOS6" (id 8) (at 71.12 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 9) (at 71.12 158.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 9) (at 71.12 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 158.75 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ca7d95e3-4bef-4a86-b847-22e0052c6f28))
@@ -2411,13 +2411,13 @@
     (property "Datasheet" "~" (id 3) (at 40.005 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 40.64 133.35 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 40.64 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM2" (id 5) (at 40.64 133.35 0)
+    (property "Sim.Type" "BSIM2" (id 5) (at 40.64 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 40.64 133.35 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 40.64 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_BSIM2" (id 8) (at 40.64 133.35 0)
@@ -2426,7 +2426,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 40.64 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 133.35 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Disabled" "1" (id 11) (at 40.64 133.35 0)
@@ -2492,13 +2492,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 134.62 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIFD" (id 5) (at 104.14 134.62 0)
+    (property "Sim.Type" "B3SOIFD" (id 5) (at 104.14 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 134.62 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_B3SOIFD" (id 8) (at 104.14 134.62 0)
@@ -2507,7 +2507,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 134.62 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d1e316ba-895e-45c2-8fe6-4191c1d711f5))
@@ -2532,13 +2532,13 @@
     (property "Datasheet" "~" (id 3) (at 71.12 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 71.12 31.75 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 71.12 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS1" (id 5) (at 71.12 31.75 0)
+    (property "Sim.Type" "MOS1" (id 5) (at 71.12 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 71.12 31.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 71.12 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_MOS1" (id 8) (at 71.12 31.75 0)
@@ -2547,7 +2547,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 71.12 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 71.12 31.75 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 71.12 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3f854927-12ab-4def-ab89-a5a91d269fee))
@@ -2578,16 +2578,16 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 5) (at 237.49 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NPN" (id 6) (at 237.49 31.75 0)
+    (property "Sim.Device" "NPN" (id 6) (at 237.49 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "GUMMELPOON" (id 7) (at 237.49 31.75 0)
+    (property "Sim.Type" "GUMMELPOON" (id 7) (at 237.49 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (id 8) (at 237.49 31.75 0)
+    (property "Sim.Pins" "1 2 3" (id 8) (at 237.49 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 area=2 areab=3 areac=4" (id 10) (at 237.49 31.75 0)
+    (property "Sim.Params" "m=1 area=2 areab=3 areac=4" (id 10) (at 237.49 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3513bfb8-8085-448e-9f7e-d0d190021924))
@@ -2773,16 +2773,16 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 5) (at 237.49 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NPN" (id 6) (at 237.49 63.5 0)
+    (property "Sim.Device" "NPN" (id 6) (at 237.49 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "VBIC" (id 7) (at 237.49 63.5 0)
+    (property "Sim.Type" "VBIC" (id 7) (at 237.49 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (id 8) (at 237.49 63.5 0)
+    (property "Sim.Pins" "1 2 3" (id 8) (at 237.49 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 area=2" (id 10) (at 237.49 63.5 0)
+    (property "Sim.Params" "m=1 area=2" (id 10) (at 237.49 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bce81a2f-0be1-42c9-811f-e4f163dcac80))
@@ -2905,13 +2905,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 160.02 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIDD" (id 5) (at 135.89 160.02 0)
+    (property "Sim.Type" "B3SOIDD" (id 5) (at 135.89 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 160.02 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_B3SOIDD" (id 8) (at 135.89 160.02 0)
@@ -2920,7 +2920,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2" (id 10) (at 135.89 160.02 0)
+    (property "Sim.Params" "l=1 w=2" (id 10) (at 135.89 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e81fa132-8749-4bd4-be8f-3ec3f33a3864))
@@ -3044,13 +3044,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 184.15 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIPD" (id 5) (at 135.89 184.15 0)
+    (property "Sim.Type" "B3SOIPD" (id 5) (at 135.89 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 184.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_B3SOIPD" (id 8) (at 135.89 184.15 0)
@@ -3059,7 +3059,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 135.89 184.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 135.89 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d2ba298d-9d82-4e8a-bac3-9b9ba0aa29e4))
@@ -3179,13 +3179,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 57.15 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS9" (id 5) (at 135.89 57.15 0)
+    (property "Sim.Type" "MOS9" (id 5) (at 135.89 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 57.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_MOS9" (id 8) (at 135.89 57.15 0)
@@ -3194,7 +3194,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8" (id 10) (at 135.89 57.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8" (id 10) (at 135.89 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 919bc0eb-1490-4e74-a45a-f0046321bfb9))
@@ -3219,7 +3219,7 @@
     (property "Datasheet" "~" (id 3) (at 71.12 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 71.12 57.15 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 71.12 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_MOS2" (id 6) (at 71.12 57.15 0)
@@ -3228,13 +3228,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 7) (at 71.12 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS2" (id 8) (at 71.12 57.15 0)
+    (property "Sim.Type" "MOS2" (id 8) (at 71.12 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 9) (at 71.12 57.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 9) (at 71.12 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 71.12 57.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 71.12 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3b391180-9471-4ea5-bba4-f056d8a2fddd))
@@ -3284,13 +3284,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 5) (at 269.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PNP" (id 6) (at 269.24 95.25 0)
+    (property "Sim.Device" "PNP" (id 6) (at 269.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HICUML2" (id 7) (at 269.24 95.25 0)
+    (property "Sim.Type" "HICUML2" (id 7) (at 269.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (id 8) (at 269.24 95.25 0)
+    (property "Sim.Pins" "1 2 3" (id 8) (at 269.24 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Disabled" "1" (id 9) (at 269.24 95.25 0)
@@ -3318,13 +3318,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 82.55 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B4SOI" (id 5) (at 135.89 82.55 0)
+    (property "Sim.Type" "B4SOI" (id 5) (at 135.89 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 82.55 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_B4SOI" (id 8) (at 135.89 82.55 0)
@@ -3333,7 +3333,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 ad=8 as=9 pd=10 ps=11 nrd=12 nrs=13" (id 10) (at 135.89 82.55 0)
+    (property "Sim.Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 ad=8 as=9 pd=10 ps=11 nrd=12 nrs=13" (id 10) (at 135.89 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3458e58d-dd58-438a-982e-e0fa7f372080))
@@ -3531,13 +3531,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 31.75 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM3" (id 5) (at 104.14 31.75 0)
+    (property "Sim.Type" "BSIM3" (id 5) (at 104.14 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 31.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_BSIM3" (id 8) (at 104.14 31.75 0)
@@ -3546,7 +3546,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 31.75 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0d004990-db3b-44d6-bf4a-842407933b40))
@@ -3647,13 +3647,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 184.15 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIPD" (id 5) (at 104.14 184.15 0)
+    (property "Sim.Type" "B3SOIPD" (id 5) (at 104.14 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 184.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_B3SOIPD" (id 8) (at 104.14 184.15 0)
@@ -3662,7 +3662,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 184.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 104.14 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ce1270c2-6de0-48b1-8963-024a76ed069c))
@@ -3707,13 +3707,13 @@
     (property "Datasheet" "~" (id 3) (at 199.39 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 199.39 82.55 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 199.39 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HISIMHV2" (id 5) (at 199.39 82.55 0)
+    (property "Sim.Type" "HISIMHV2" (id 5) (at 199.39 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 199.39 82.55 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 199.39 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_HISIMHV2" (id 8) (at 199.39 82.55 0)
@@ -3722,7 +3722,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 199.39 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 199.39 82.55 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 199.39 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 20f91116-def6-4bff-96c0-c27f1a948b17))
@@ -3747,13 +3747,13 @@
     (property "Datasheet" "~" (id 3) (at 167.005 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 167.64 31.75 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 167.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HISIM2" (id 5) (at 167.64 31.75 0)
+    (property "Sim.Type" "HISIM2" (id 5) (at 167.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 167.64 31.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 167.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_HISIM2" (id 8) (at 167.64 31.75 0)
@@ -3762,7 +3762,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 167.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 167.64 31.75 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 167.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8f62beda-f5e2-4dc4-bd19-a1cde5d4d234))
@@ -3865,13 +3865,13 @@
     (property "Datasheet" "~" (id 3) (at 71.12 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 71.12 82.55 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 71.12 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS3" (id 5) (at 71.12 82.55 0)
+    (property "Sim.Type" "MOS3" (id 5) (at 71.12 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 71.12 82.55 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 71.12 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_MOS3" (id 8) (at 71.12 82.55 0)
@@ -3880,7 +3880,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 71.12 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 82.55 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a356c257-c02c-4e81-8cb3-f795199acddc))
@@ -4060,13 +4060,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 82.55 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B4SOI" (id 5) (at 104.14 82.55 0)
+    (property "Sim.Type" "B4SOI" (id 5) (at 104.14 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 82.55 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_B4SOI" (id 8) (at 104.14 82.55 0)
@@ -4075,7 +4075,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 ad=8 as=9 pd=10 ps=11 nrd=12 nrs=13" (id 10) (at 104.14 82.55 0)
+    (property "Sim.Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 ad=8 as=9 pd=10 ps=11 nrd=12 nrs=13" (id 10) (at 104.14 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid dc116558-2d46-4c60-b99b-c761c3bfd995))
@@ -4158,13 +4158,13 @@
     (property "Datasheet" "~" (id 3) (at 167.005 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 167.64 57.15 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 167.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HISIMHV1" (id 5) (at 167.64 57.15 0)
+    (property "Sim.Type" "HISIMHV1" (id 5) (at 167.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 167.64 57.15 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 167.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_HISIMHV1" (id 8) (at 167.64 57.15 0)
@@ -4173,7 +4173,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 167.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 167.64 57.15 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 167.64 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 50131b6b-ce16-4326-abc2-dd9d3aeaeff2))
@@ -4256,7 +4256,7 @@
     (property "Datasheet" "~" (id 3) (at 40.005 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 40.64 107.95 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 40.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_BSIM1" (id 6) (at 40.64 107.95 0)
@@ -4265,13 +4265,13 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 7) (at 40.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM1" (id 8) (at 40.64 107.95 0)
+    (property "Sim.Type" "BSIM1" (id 8) (at 40.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 9) (at 40.64 107.95 0)
+    (property "Sim.Pins" "1 2 3 4" (id 9) (at 40.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 107.95 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 40.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c725ed8b-4644-4ada-b9de-2f4ac534c5d5))
@@ -4412,13 +4412,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 107.95 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM4" (id 5) (at 135.89 107.95 0)
+    (property "Sim.Type" "BSIM4" (id 5) (at 135.89 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 107.95 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_BSIM4" (id 8) (at 135.89 107.95 0)
@@ -4427,7 +4427,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 sca=8 scb=9 scc=10 ad=11 as=12 pd=13 ps=14 nrd=15 nrs=16" (id 10) (at 135.89 107.95 0)
+    (property "Sim.Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 sca=8 scb=9 scc=10 ad=11 as=12 pd=13 ps=14 nrd=15 nrs=16" (id 10) (at 135.89 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 42ce3c6a-87ef-4d74-ae7b-37687c212630))
@@ -4529,13 +4529,13 @@
     (property "Datasheet" "~" (id 3) (at 40.005 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 40.64 31.75 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 40.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "MOS1" (id 5) (at 40.64 31.75 0)
+    (property "Sim.Type" "MOS1" (id 5) (at 40.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 40.64 31.75 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 40.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_MOS1" (id 8) (at 40.64 31.75 0)
@@ -4544,7 +4544,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 40.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 40.64 31.75 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7" (id 10) (at 40.64 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 58a3020f-e986-4d90-a0c8-49c8a27d1310))
@@ -4628,13 +4628,13 @@
     (property "Datasheet" "~" (id 3) (at 167.005 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 167.64 82.55 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 167.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "HISIMHV2" (id 5) (at 167.64 82.55 0)
+    (property "Sim.Type" "HISIMHV2" (id 5) (at 167.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 167.64 82.55 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 167.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_HISIMHV2" (id 8) (at 167.64 82.55 0)
@@ -4643,7 +4643,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 167.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 167.64 82.55 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 167.64 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d91d47f6-831f-4bf0-9255-0344f24fe6ad))
@@ -4668,13 +4668,13 @@
     (property "Datasheet" "~" (id 3) (at 71.12 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 71.12 133.35 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 71.12 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM2" (id 5) (at 71.12 133.35 0)
+    (property "Sim.Type" "BSIM2" (id 5) (at 71.12 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 71.12 133.35 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 71.12 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_BSIM2" (id 8) (at 71.12 133.35 0)
@@ -4683,7 +4683,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 71.12 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 133.35 0)
+    (property "Sim.Params" "l=1 w=2 m=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 71.12 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Disabled" "1" (id 11) (at 71.12 133.35 0)
@@ -4730,13 +4730,13 @@
     (property "Datasheet" "~" (id 3) (at 135.89 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PMOS" (id 4) (at 135.89 134.62 0)
+    (property "Sim.Device" "PMOS" (id 4) (at 135.89 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "B3SOIFD" (id 5) (at 135.89 134.62 0)
+    (property "Sim.Type" "B3SOIFD" (id 5) (at 135.89 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 135.89 134.62 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 135.89 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "PMOS_B3SOIFD" (id 8) (at 135.89 134.62 0)
@@ -4745,7 +4745,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 135.89 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 135.89 134.62 0)
+    (property "Sim.Params" "m=1 l=2 w=3 ad=4 as=5 pd=6 ps=7 nrd=8 nrs=9" (id 10) (at 135.89 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 61dc0905-c8a5-42d8-9b66-1b56d88e1ba6))
@@ -4796,16 +4796,16 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 5) (at 269.24 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "PNP" (id 6) (at 269.24 31.75 0)
+    (property "Sim.Device" "PNP" (id 6) (at 269.24 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "GUMMELPOON" (id 7) (at 269.24 31.75 0)
+    (property "Sim.Type" "GUMMELPOON" (id 7) (at 269.24 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (id 8) (at 269.24 31.75 0)
+    (property "Sim.Pins" "1 2 3" (id 8) (at 269.24 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "m=1 area=2 areab=3 areac=4" (id 10) (at 269.24 31.75 0)
+    (property "Sim.Params" "m=1 area=2 areab=3 areac=4" (id 10) (at 269.24 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9bbd8618-bec4-4380-bc96-9d1c6642a2c3))
@@ -4830,13 +4830,13 @@
     (property "Datasheet" "~" (id 3) (at 103.505 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NMOS" (id 4) (at 104.14 107.95 0)
+    (property "Sim.Device" "NMOS" (id 4) (at 104.14 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "BSIM4" (id 5) (at 104.14 107.95 0)
+    (property "Sim.Type" "BSIM4" (id 5) (at 104.14 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3 4" (id 6) (at 104.14 107.95 0)
+    (property "Sim.Pins" "1 2 3 4" (id 6) (at 104.14 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "NMOS_BSIM4" (id 8) (at 104.14 107.95 0)
@@ -4845,7 +4845,7 @@
     (property "Sim_Library" "instance_params.lib.spice" (id 9) (at 104.14 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 sca=8 scb=9 scc=10 ad=11 as=12 pd=13 ps=14 nrd=15 nrs=16" (id 10) (at 104.14 107.95 0)
+    (property "Sim.Params" "l=1 w=2 m=3 nf=4 sa=5 sb=6 sd=7 sca=8 scb=9 scc=10 ad=11 as=12 pd=13 ps=14 nrd=15 nrs=16" (id 10) (at 104.14 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 57703c3a-c0df-41d8-a7c7-60addea3e16e))
diff --git a/qa/data/eeschema/spice_netlists/legacy_opamp/legacy_opamp.kicad_sch b/qa/data/eeschema/spice_netlists/legacy_opamp/legacy_opamp.kicad_sch
index 9b625f9ccf..3fdb836ee6 100644
--- a/qa/data/eeschema/spice_netlists/legacy_opamp/legacy_opamp.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/legacy_opamp/legacy_opamp.kicad_sch
@@ -378,13 +378,13 @@
     (property "Datasheet" "~" (at 153.67 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 153.67 101.6 0)
+    (property "Sim.Device" "V" (at 153.67 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 153.67 101.6 0)
+    (property "Sim.Pins" "1 2" (at 153.67 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "dc=5" (at 160.02 104.14 0)
+    (property "Sim.Params" "dc=5" (at 160.02 104.14 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 57bc86dd-2187-44f8-993f-d5ba4cfd5b25))
@@ -413,7 +413,7 @@
     (property "Datasheet" "~" (at 152.4 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 152.4 111.125 90)
+    (property "Sim.Device" "R" (at 152.4 111.125 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8570589f-3239-4688-b9b7-f28babea55a9))
@@ -458,7 +458,7 @@
     (property "Reference" "VIN1" (at 118.11 91.44 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 118.11 93.98 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 118.11 93.98 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 138.43 93.98 0)
@@ -467,13 +467,13 @@
     (property "Datasheet" "~" (at 138.43 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 138.43 93.98 0)
+    (property "Sim.Device" "V" (at 138.43 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "SIN" (at 138.43 93.98 0)
+    (property "Sim.Type" "SIN" (at 138.43 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "ampl=500m f=1k" (at 125.73 96.52 0)
+    (property "Sim.Params" "ampl=500m f=1k" (at 125.73 96.52 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid e14fe139-e230-4c18-ba7e-26a3436f2277))
@@ -481,7 +481,7 @@
     (instances
       (project "legacy_opamp"
         (path "/986bd0ba-4f89-4046-b50f-9d5b4a950ed1"
-          (reference "VIN1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "VIN1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -502,13 +502,13 @@
     (property "Datasheet" "~" (at 153.67 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 153.67 76.2 0)
+    (property "Sim.Device" "V" (at 153.67 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 153.67 76.2 0)
+    (property "Sim.Pins" "1 2" (at 153.67 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "dc=5" (at 160.02 78.74 0)
+    (property "Sim.Params" "dc=5" (at 160.02 78.74 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 776936fb-a72c-4688-a6a7-994f72ac29e5))
@@ -537,7 +537,7 @@
     (property "Datasheet" "~" (at 144.78 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 144.78 111.125 90)
+    (property "Sim.Device" "R" (at 144.78 111.125 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 18222c52-d810-454a-9f36-37f7e5183634))
@@ -616,13 +616,13 @@
     (property "Datasheet" "https://www.analog.com/media/en/technical-documentation/data-sheets/AD797.pdf" (at 157.48 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SPICE" (at 156.21 88.9 0)
+    (property "Sim.Device" "SPICE" (at 156.21 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "3 2 7 4 6 ~ ~ ~" (at 156.21 88.9 0)
+    (property "Sim.Pins" "3 2 7 4 6 ~ ~ ~" (at 156.21 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "type=X model=uopamp_lvl2 lib=uopamp.lib.spice" (at 156.21 88.9 0)
+    (property "Sim.Params" "type=X model=uopamp_lvl2 lib=uopamp.lib.spice" (at 156.21 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7bc9184d-2a47-45f1-be60-ec64a780338c))
diff --git a/qa/data/eeschema/spice_netlists/npn_ce_amp/npn_ce_amp.kicad_sch b/qa/data/eeschema/spice_netlists/npn_ce_amp/npn_ce_amp.kicad_sch
index 5d8d039995..52c20e600b 100644
--- a/qa/data/eeschema/spice_netlists/npn_ce_amp/npn_ce_amp.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/npn_ce_amp/npn_ce_amp.kicad_sch
@@ -499,7 +499,7 @@
     (property "Datasheet" "~" (at 120.65 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 120.65 88.9 90)
+    (property "Sim.Device" "C" (at 120.65 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 94852f4d-516a-49ae-94b0-d7194707acba))
@@ -559,13 +559,13 @@
     (property "Sim_Library" "npn.lib.spice" (at 135.89 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "NPN" (at 135.89 88.9 0)
+    (property "Sim.Device" "NPN" (at 135.89 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "GUMMELPOON" (at 135.89 88.9 0)
+    (property "Sim.Type" "GUMMELPOON" (at 135.89 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2 3" (at 135.89 88.9 0)
+    (property "Sim.Pins" "1 2 3" (at 135.89 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d3ec8923-753b-4949-adc8-2a01d4bd537e))
@@ -596,7 +596,7 @@
     (property "Datasheet" "~" (at 148.59 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 148.59 101.6 0)
+    (property "Sim.Device" "C" (at 148.59 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e537f30b-df49-4540-b7c3-be90d17f9974))
@@ -625,7 +625,7 @@
     (property "Datasheet" "~" (at 139.7 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 139.7 76.2 0)
+    (property "Sim.Device" "R" (at 139.7 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e6274a8f-746c-4ba0-8504-4c8082be16cf))
@@ -654,16 +654,16 @@
     (property "Datasheet" "~" (at 114.3 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 93.98 0)
+    (property "Sim.Device" "V" (at 114.3 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "SIN" (at 114.3 93.98 0)
+    (property "Sim.Type" "SIN" (at 114.3 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 114.3 93.98 0)
+    (property "Sim.Pins" "1 2" (at 114.3 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "dc=0 ampl=10m f=10k" (at 114.3 106.68 0)
+    (property "Sim.Params" "dc=0 ampl=10m f=10k" (at 114.3 106.68 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 0a7ec182-cf4b-4daf-b269-fcaedb3df0f3))
@@ -692,7 +692,7 @@
     (property "Datasheet" "~" (at 139.7 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 139.7 101.6 0)
+    (property "Sim.Device" "R" (at 139.7 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 537b0f91-9fdd-4f38-a125-8bcc16fcae66))
@@ -746,7 +746,7 @@
     (property "Datasheet" "~" (at 127 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 127 85.09 0)
+    (property "Sim.Device" "R" (at 127 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4bd7b8c1-ef81-4d9e-8786-74309346686c))
@@ -775,7 +775,7 @@
     (property "Datasheet" "~" (at 139.7 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 139.7 109.22 0)
+    (property "Sim.Device" "R" (at 139.7 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4bb143a1-985c-492c-a6e7-e81a25da1fda))
@@ -804,7 +804,7 @@
     (property "Datasheet" "~" (at 127 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 127 92.71 0)
+    (property "Sim.Device" "R" (at 127 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 305f44d5-f5cd-42d1-81ea-89b233f6b5a9))
@@ -833,13 +833,13 @@
     (property "Datasheet" "~" (at 101.6 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 101.6 85.09 0)
+    (property "Sim.Device" "V" (at 101.6 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 101.6 85.09 0)
+    (property "Sim.Pins" "1 2" (at 101.6 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "dc=9" (at 107.95 87.63 0)
+    (property "Sim.Params" "dc=9" (at 107.95 87.63 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 925c8d5e-6ef7-4cb4-8784-a2246cc254a4))
diff --git a/qa/data/eeschema/spice_netlists/opamp/opamp.kicad_sch b/qa/data/eeschema/spice_netlists/opamp/opamp.kicad_sch
index 4c158c58c2..4379c7b780 100644
--- a/qa/data/eeschema/spice_netlists/opamp/opamp.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/opamp/opamp.kicad_sch
@@ -357,7 +357,7 @@
     (property "Reference" "VIN1" (at 116.84 92.71 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 116.84 95.25 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 116.84 95.25 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 138.43 93.98 0)
@@ -366,13 +366,13 @@
     (property "Datasheet" "~" (at 138.43 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 138.43 93.98 0)
+    (property "Sim.Device" "V" (at 138.43 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "SIN" (at 138.43 93.98 0)
+    (property "Sim.Type" "SIN" (at 138.43 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "ampl=500m f=1k" (at 124.46 97.79 0)
+    (property "Sim.Params" "ampl=500m f=1k" (at 124.46 97.79 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 19da877c-a69c-4a1d-8029-3483030b2fe0))
@@ -380,7 +380,7 @@
     (instances
       (project "opamp"
         (path "/fd5567b0-04f0-4d9e-b647-1775367d8ff4"
-          (reference "VIN1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "VIN1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -401,7 +401,7 @@
     (property "Datasheet" "~" (at 152.4 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 152.4 111.125 90)
+    (property "Sim.Device" "R" (at 152.4 111.125 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7cf6d433-268b-4901-b74d-8803afdfc194))
@@ -430,7 +430,7 @@
     (property "Datasheet" "~" (at 153.67 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 153.67 76.2 0)
+    (property "Sim.Device" "V" (at 153.67 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 885c89aa-c780-4741-b398-9d4b8e38f094))
@@ -515,10 +515,10 @@
     (property "Sim_Library" "uopamp.lib.spice" (at 156.21 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SUBCKT" (at 156.21 88.9 0)
+    (property "Sim.Device" "SUBCKT" (at 156.21 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "3 4 5 2 1" (at 156.21 88.9 0)
+    (property "Sim.Pins" "3 4 5 2 1" (at 156.21 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "2" (uuid 5f74e7f3-6e5a-4915-9655-9c0f0523fb0a))
@@ -575,7 +575,7 @@
     (property "Datasheet" "~" (at 153.67 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 153.67 101.6 0)
+    (property "Sim.Device" "V" (at 153.67 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 62bdf880-7061-4b86-be3a-09bf959fae21))
@@ -604,7 +604,7 @@
     (property "Datasheet" "~" (at 144.78 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 144.78 111.125 90)
+    (property "Sim.Device" "R" (at 144.78 111.125 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fe3f00f2-cee0-4154-8f20-4097e41e635f))
diff --git a/qa/data/eeschema/spice_netlists/potentiometers/potentiometers.kicad_sch b/qa/data/eeschema/spice_netlists/potentiometers/potentiometers.kicad_sch
index f557f145a3..9fff6a388e 100644
--- a/qa/data/eeschema/spice_netlists/potentiometers/potentiometers.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/potentiometers/potentiometers.kicad_sch
@@ -332,10 +332,10 @@
     (property "Datasheet" "~" (at 152.4 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 152.4 133.35 0)
+    (property "Sim.Device" "R" (at 152.4 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "POT" (at 152.4 133.35 0)
+    (property "Sim.Type" "POT" (at 152.4 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c77da26e-2c80-4310-84bf-e1a90dc2094f))
@@ -365,10 +365,10 @@
     (property "Datasheet" "~" (at 152.4 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 152.4 57.15 0)
+    (property "Sim.Device" "R" (at 152.4 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "POT" (at 152.4 57.15 0)
+    (property "Sim.Type" "POT" (at 152.4 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 72f78aa8-0a10-4afc-bce0-380904d14d13))
@@ -423,7 +423,7 @@
     (property "Datasheet" "~" (at 114.3 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 114.3 57.15 0)
+    (property "Sim.Device" "V" (at 114.3 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4553662d-6271-4548-b150-dc1eb8221d40))
@@ -477,10 +477,10 @@
     (property "Datasheet" "~" (at 152.4 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 152.4 95.25 0)
+    (property "Sim.Device" "R" (at 152.4 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "POT" (at 152.4 95.25 0)
+    (property "Sim.Type" "POT" (at 152.4 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 506d640e-0a3d-4ba3-a5f0-80d908fad32d))
diff --git a/qa/data/eeschema/spice_netlists/rectifier/rectifier.kicad_sch b/qa/data/eeschema/spice_netlists/rectifier/rectifier.kicad_sch
index 4886939226..ea0b4f25d6 100644
--- a/qa/data/eeschema/spice_netlists/rectifier/rectifier.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/rectifier/rectifier.kicad_sch
@@ -339,7 +339,7 @@
     (property "Reference" "V1" (at 119.38 99.06 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${SIM_DEVICE} ${SIM_TYPE}" (at 119.38 101.6 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 119.38 101.6 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 134.62 101.6 0)
@@ -348,16 +348,16 @@
     (property "Datasheet" "~" (at 134.62 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 134.62 101.6 0)
+    (property "Sim.Device" "V" (at 134.62 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "SIN" (at 134.62 101.6 0)
+    (property "Sim.Type" "SIN" (at 134.62 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "ampl=5 f=1k" (at 124.46 104.14 0)
+    (property "Sim.Params" "ampl=5 f=1k" (at 124.46 104.14 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Sim_Pins" "1 2" (at 134.62 101.6 0)
+    (property "Sim.Pins" "1 2" (at 134.62 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a29d8f63-65fa-4d69-b0d4-cfa5c00fc5ab))
@@ -365,7 +365,7 @@
     (instances
       (project "rectifier"
         (path "/0c9c3a92-6a4e-4a5b-b607-2cfe0f3c4b2e"
-          (reference "V1") (unit 1) (value "${SIM_DEVICE} ${SIM_TYPE}") (footprint "")
+          (reference "V1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -386,7 +386,7 @@
     (property "Datasheet" "~" (at 155.575 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 155.575 100.33 0)
+    (property "Sim.Device" "C" (at 155.575 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0f0333bf-611a-47ec-bd68-52c7b166c571))
@@ -415,7 +415,7 @@
     (property "Datasheet" "~" (at 151.765 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "D" (at 151.765 96.52 0)
+    (property "Sim.Device" "D" (at 151.765 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Name" "DIODE1" (at 151.765 96.52 0)
@@ -424,7 +424,7 @@
     (property "Sim_Library" "diode.lib" (at 151.765 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "2 1" (at 151.765 96.52 0)
+    (property "Sim.Pins" "2 1" (at 151.765 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cb1986eb-8b78-41be-ab05-5001090a2a65))
@@ -453,7 +453,7 @@
     (property "Datasheet" "~" (at 165.1 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 165.1 100.33 0)
+    (property "Sim.Device" "R" (at 165.1 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 908dc772-f335-42cf-8fc9-474d99c97d6b))
diff --git a/qa/data/eeschema/spice_netlists/rlc/rlc.kicad_sch b/qa/data/eeschema/spice_netlists/rlc/rlc.kicad_sch
index cb824de552..2473d463f3 100644
--- a/qa/data/eeschema/spice_netlists/rlc/rlc.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/rlc/rlc.kicad_sch
@@ -439,7 +439,7 @@
     (property "Datasheet" "~" (at 127 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 127 107.95 0)
+    (property "Sim.Device" "C" (at 127 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 903935c6-35d3-4916-ada6-6df4770de2aa))
@@ -468,7 +468,7 @@
     (property "Datasheet" "~" (at 190.5 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 190.5 95.25 0)
+    (property "Sim.Device" "R" (at 190.5 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7eaeaa13-0708-49b3-b75d-a26c16d10ee7))
@@ -497,7 +497,7 @@
     (property "Datasheet" "~" (at 203.2 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "L" (at 203.2 95.25 0)
+    (property "Sim.Device" "L" (at 203.2 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4ebb4d0f-b627-4dc9-9847-2a94f54f22db))
@@ -526,7 +526,7 @@
     (property "Datasheet" "~" (at 127 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 127 82.55 0)
+    (property "Sim.Device" "R" (at 127 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 074f07c5-e6cf-47ec-af8c-7b1f0375a3bf))
@@ -655,7 +655,7 @@
     (property "Datasheet" "~" (at 215.9 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "C" (at 215.9 95.25 0)
+    (property "Sim.Device" "C" (at 215.9 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 37d61ed5-e320-4d57-bff7-ec42aeca9f21))
@@ -675,7 +675,7 @@
     (property "Reference" "I1" (at 168.91 93.345 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 168.91 95.885 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 168.91 95.885 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 165.1 95.25 0)
@@ -684,13 +684,13 @@
     (property "Datasheet" "~" (at 165.1 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "I" (at 165.1 95.25 0)
+    (property "Sim.Device" "I" (at 165.1 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "PULSE" (at 165.1 95.25 0)
+    (property "Sim.Type" "PULSE" (at 165.1 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "y2=1 tw=1u" (at 165.1 95.25 0)
+    (property "Sim.Params" "y2=1 tw=1u" (at 165.1 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8a80b586-d30c-44d1-b165-e9c7e3047e62))
@@ -698,7 +698,7 @@
     (instances
       (project "rlc"
         (path "/b0197b4d-36ea-4821-991f-20bf73bcc80c"
-          (reference "I1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "I1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -710,7 +710,7 @@
     (property "Reference" "V1" (at 105.41 93.345 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 105.41 95.885 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 105.41 95.885 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 101.6 95.25 0)
@@ -719,13 +719,13 @@
     (property "Datasheet" "~" (at 101.6 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 101.6 95.25 0)
+    (property "Sim.Device" "V" (at 101.6 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "PULSE" (at 101.6 95.25 0)
+    (property "Sim.Type" "PULSE" (at 101.6 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "y2=1 tw=1u" (at 101.6 95.25 0)
+    (property "Sim.Params" "y2=1 tw=1u" (at 101.6 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e8818239-f91c-47e3-ac1e-178af6b74e90))
@@ -733,7 +733,7 @@
     (instances
       (project "rlc"
         (path "/b0197b4d-36ea-4821-991f-20bf73bcc80c"
-          (reference "V1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "V1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -754,7 +754,7 @@
     (property "Datasheet" "~" (at 127 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "L" (at 127 95.25 0)
+    (property "Sim.Device" "L" (at 127 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8e8c16ca-b9d0-42ae-8073-59118828361f))
diff --git a/qa/data/eeschema/spice_netlists/switches/switches.kicad_sch b/qa/data/eeschema/spice_netlists/switches/switches.kicad_sch
index f450c65e9f..87aabe5c7f 100644
--- a/qa/data/eeschema/spice_netlists/switches/switches.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/switches/switches.kicad_sch
@@ -467,7 +467,7 @@
     (property "Reference" "V1" (at 105.41 79.375 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${SIM_DEVICE} ${SIM_TYPE}" (at 105.41 81.915 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 105.41 81.915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 101.6 81.28 0)
@@ -476,13 +476,13 @@
     (property "Datasheet" "~" (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 101.6 81.28 0)
+    (property "Sim.Device" "V" (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "PULSE" (at 101.6 81.28 0)
+    (property "Sim.Type" "PULSE" (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "y2=1 td=1m tr=1u tf=1u tw=1m" (at 121.92 83.82 0)
+    (property "Sim.Params" "y2=1 td=1m tr=1u tf=1u tw=1m" (at 121.92 83.82 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 117dae63-cbae-4915-acae-e6e10531e40e))
@@ -490,7 +490,7 @@
     (instances
       (project "switches"
         (path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
-          (reference "V1") (unit 1) (value "${SIM_DEVICE} ${SIM_TYPE}") (footprint "")
+          (reference "V1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -511,7 +511,7 @@
     (property "Datasheet" "~" (at 168.91 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 168.91 96.52 0)
+    (property "Sim.Device" "V" (at 168.91 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0b55c5be-6cf6-4c8b-92f9-3478d772166e))
@@ -565,16 +565,16 @@
     (property "Datasheet" "https://www.panasonic-electric-works.com/pew/es/downloads/ds_dw_hl_en.pdf" (at 163.83 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SW" (at 163.83 121.92 0)
+    (property "Sim.Device" "SW" (at 163.83 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "I" (at 163.83 121.92 0)
+    (property "Sim.Type" "I" (at 163.83 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 6 3 5" (at 163.83 121.92 0)
+    (property "Sim.Pins" "1 6 3 5" (at 163.83 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Enable" "0" (at 163.83 121.92 0)
+    (property "Sim.Enable" "0" (at 163.83 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 76e69abc-f617-4b9c-a790-060112fdebed))
@@ -705,7 +705,7 @@
     (property "Datasheet" "~" (at 184.15 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 184.15 85.09 0)
+    (property "Sim.Device" "R" (at 184.15 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ca5b7fb7-b9ed-4675-bf02-833e831d13b1))
@@ -759,16 +759,16 @@
     (property "Datasheet" "https://www.panasonic-electric-works.com/pew/es/downloads/ds_dw_hl_en.pdf" (at 163.83 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "SW" (at 163.83 83.82 0)
+    (property "Sim.Device" "SW" (at 163.83 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "V" (at 163.83 83.82 0)
+    (property "Sim.Type" "V" (at 163.83 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 6 3 5" (at 163.83 83.82 0)
+    (property "Sim.Pins" "1 6 3 5" (at 163.83 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "thr=500m his=0 ron=100m roff=1T" (at 163.83 83.82 0)
+    (property "Sim.Params" "thr=500m his=0 ron=100m roff=1T" (at 163.83 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 985f68da-ac8b-4dfe-a794-ff843a4dcef6))
@@ -790,7 +790,7 @@
     (property "Reference" "V5" (at 105.41 117.475 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${SIM_DEVICE} ${SIM_TYPE}" (at 105.41 120.015 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 105.41 120.015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 101.6 119.38 0)
@@ -799,13 +799,13 @@
     (property "Datasheet" "~" (at 101.6 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 101.6 119.38 0)
+    (property "Sim.Device" "V" (at 101.6 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "PULSE" (at 101.6 119.38 0)
+    (property "Sim.Type" "PULSE" (at 101.6 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "y2=1 td=3m tr=1u tf=1u tw=1m" (at 121.92 121.92 0)
+    (property "Sim.Params" "y2=1 td=3m tr=1u tf=1u tw=1m" (at 121.92 121.92 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid ddd2ffc3-7553-4ad4-936b-0f723731d49a))
@@ -813,7 +813,7 @@
     (instances
       (project "switches"
         (path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
-          (reference "V5") (unit 1) (value "${SIM_DEVICE} ${SIM_TYPE}") (footprint "")
+          (reference "V5") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -859,10 +859,10 @@
     (property "Datasheet" "~" (at 184.15 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 184.15 120.65 0)
+    (property "Sim.Device" "R" (at 184.15 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Pins" "1 2" (at 184.15 120.65 0)
+    (property "Sim.Pins" "1 2" (at 184.15 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Sim_Disabled" "1" (at 184.15 120.65 0)
@@ -894,7 +894,7 @@
     (property "Datasheet" "~" (at 168.91 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 168.91 134.62 0)
+    (property "Sim.Device" "V" (at 168.91 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 443fd48c-8d2e-46b1-8fbf-0c210fd528fb))
diff --git a/qa/data/eeschema/spice_netlists/tlines/tlines.kicad_sch b/qa/data/eeschema/spice_netlists/tlines/tlines.kicad_sch
index 2c68449c7e..4a74ab0545 100644
--- a/qa/data/eeschema/spice_netlists/tlines/tlines.kicad_sch
+++ b/qa/data/eeschema/spice_netlists/tlines/tlines.kicad_sch
@@ -342,7 +342,7 @@
     (property "Reference" "TLINE2" (at 146.0509 109.22 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 146.0509 111.76 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 146.0509 111.76 0)
       (effects (font (size 1.27 1.27)))
     )
     (property "Footprint" "" (at 146.05 114.3 0)
@@ -351,13 +351,13 @@
     (property "Datasheet" "http://ngspice.sourceforge.net/docs/ngspice-36-manual.pdf#7f" (at 146.05 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "TLINE" (at 146.05 114.3 0)
+    (property "Sim.Device" "TLINE" (at 146.05 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "RLGC" (at 146.05 114.3 0)
+    (property "Sim.Type" "RLGC" (at 146.05 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "len=1 r=0 l=1.25m g=0 c=500n" (at 146.05 114.3 0)
+    (property "Sim.Params" "len=1 r=0 l=1.25m g=0 c=500n" (at 146.05 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ae869dc5-9148-4a5a-a155-bcf7a2097121))
@@ -367,7 +367,7 @@
     (instances
       (project "tlines"
         (path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
-          (reference "TLINE2") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "TLINE2") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -379,7 +379,7 @@
     (property "Reference" "V1" (at 86.36 78.74 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 86.36 81.28 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 86.36 81.28 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 127 81.28 0)
@@ -388,13 +388,13 @@
     (property "Datasheet" "~" (at 127 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 127 81.28 0)
+    (property "Sim.Device" "V" (at 127 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "PULSE" (at 127 81.28 0)
+    (property "Sim.Type" "PULSE" (at 127 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "y2=1 tr=1u tf=1u tw=50u per=100u" (at 104.14 85.09 0)
+    (property "Sim.Params" "y2=1 tr=1u tf=1u tw=50u per=100u" (at 104.14 85.09 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 5e20d69f-9003-4997-b6ac-fca384177c2c))
@@ -402,7 +402,7 @@
     (instances
       (project "tlines"
         (path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
-          (reference "V1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "V1") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )
@@ -498,7 +498,7 @@
     (property "Datasheet" "~" (at 165.1 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 165.1 80.01 0)
+    (property "Sim.Device" "R" (at 165.1 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1ec2478e-c74c-4b1f-94f8-f36178bb057b))
@@ -543,7 +543,7 @@
     (property "Reference" "TLINE1" (at 146.0509 71.12 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "${Sim_Device}" (at 146.0509 73.66 0)
+    (property "Value" "${Sim.Device}" (at 146.0509 73.66 0)
       (effects (font (size 1.27 1.27)))
     )
     (property "Footprint" "" (at 146.05 76.2 0)
@@ -552,10 +552,10 @@
     (property "Datasheet" "http://ngspice.sourceforge.net/docs/ngspice-36-manual.pdf#7f" (at 146.05 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "TLINE" (at 146.05 76.2 0)
+    (property "Sim.Device" "TLINE" (at 146.05 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "z0=50 td=25u" (at 146.05 76.2 0)
+    (property "Sim.Params" "z0=50 td=25u" (at 146.05 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ea050e5c-1246-4281-a897-0695b0c28888))
@@ -565,7 +565,7 @@
     (instances
       (project "tlines"
         (path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
-          (reference "TLINE1") (unit 1) (value "${Sim_Device}") (footprint "")
+          (reference "TLINE1") (unit 1) (value "${Sim.Device}") (footprint "")
         )
       )
     )
@@ -586,7 +586,7 @@
     (property "Datasheet" "~" (at 165.1 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "R" (at 165.1 118.11 0)
+    (property "Sim.Device" "R" (at 165.1 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 720acbb9-4c0b-48b1-9b2a-ca5415db622e))
@@ -631,7 +631,7 @@
     (property "Reference" "V2" (at 86.36 115.57 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "${Sim_Device} ${Sim_Type}" (at 86.36 118.11 0)
+    (property "Value" "${Sim.Device} ${Sim.Type}" (at 86.36 118.11 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (at 127 119.38 0)
@@ -640,13 +640,13 @@
     (property "Datasheet" "~" (at 127 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Device" "V" (at 127 119.38 0)
+    (property "Sim.Device" "V" (at 127 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Type" "PULSE" (at 127 119.38 0)
+    (property "Sim.Type" "PULSE" (at 127 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim_Params" "y2=1 tr=1u tf=1u tw=50u per=100u" (at 104.14 121.92 0)
+    (property "Sim.Params" "y2=1 tr=1u tf=1u tw=50u per=100u" (at 104.14 121.92 0)
       (effects (font (size 1.27 1.27)))
     )
     (pin "1" (uuid 4697d16d-3f33-43d4-bdc9-9604ce8ac4d7))
@@ -654,7 +654,7 @@
     (instances
       (project "tlines"
         (path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
-          (reference "V2") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
+          (reference "V2") (unit 1) (value "${Sim.Device} ${Sim.Type}") (footprint "")
         )
       )
     )