From b44bab9943924076ff115f1328a17b2479941914 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sun, 4 Jan 2026 17:10:35 +0100
Subject: [PATCH] Making net name mandatory (using expanded_name) for L2N
 format, so that we can refer to net name in log entries later

---
 src/db/db/dbLayoutToNetlistWriter.cc          | 14 ++--
 src/lvs/unit_tests/lvsTests.cc                |  6 +-
 testdata/algo/l2n_reader_au.txt               | 26 +++---
 testdata/algo/l2n_reader_au_4.l2n             | 46 +++++------
 testdata/algo/l2n_reader_au_5.l2n             | 24 +++---
 testdata/algo/l2n_reader_au_7.l2n             |  2 +-
 testdata/algo/l2n_reader_in.txt               | 42 +++++-----
 testdata/algo/l2n_reader_in_p.txt             | 42 +++++-----
 testdata/algo/l2n_reader_in_s.txt             | 42 +++++-----
 testdata/algo/l2n_writer_au.txt               | 42 +++++-----
 testdata/algo/l2n_writer_au_2b.txt            | 36 ++++-----
 testdata/algo/l2n_writer_au_2s.txt            | 36 ++++-----
 testdata/algo/l2n_writer_au_p.txt             | 42 +++++-----
 testdata/algo/l2n_writer_au_s.txt             | 42 +++++-----
 testdata/algo/lvs_test1_au.lvsdb.1            | 30 +++----
 testdata/algo/lvs_test1b_au.lvsdb.1           | 30 +++----
 testdata/algo/lvs_test2_au.lvsdb.1            | 30 +++----
 testdata/algo/lvs_test2b_au.lvsdb.1           | 30 +++----
 testdata/algo/lvs_test3_au.lvsdb              | 30 +++----
 testdata/drc/drcSimpleTests_au122.l2n         | 16 ++--
 testdata/lvs/bbdevices1.lvsdb                 |  4 +-
 testdata/lvs/bbdevices1b.lvsdb                |  4 +-
 testdata/lvs/bbdevices2.lvsdb                 |  8 +-
 testdata/lvs/bbdevices2b.lvsdb                |  8 +-
 testdata/lvs/bbdevices3.lvsdb                 |  4 +-
 testdata/lvs/bbdevices3b.lvsdb                |  4 +-
 testdata/lvs/bbdevices4.lvsdb                 |  4 +-
 testdata/lvs/bbdevices4b.lvsdb                |  4 +-
 testdata/lvs/bbdevices5.lvsdb                 |  4 +-
 testdata/lvs/bbdevices5b.lvsdb                |  4 +-
 testdata/lvs/bbdevices6.lvsdb                 |  6 +-
 testdata/lvs/bbdevices6b.lvsdb                |  6 +-
 testdata/lvs/blackbox3.lvsdb                  |  2 +-
 testdata/lvs/blackbox5.lvsdb                  |  2 +-
 testdata/lvs/custom_resistors.l2n.1           | 18 ++---
 testdata/lvs/custom_resistors.l2n.2           | 18 ++---
 testdata/lvs/custom_resistors.l2n.3           | 18 ++---
 testdata/lvs/double_height.lvsdb              | 10 +--
 testdata/lvs/double_height2.lvsdb             |  8 +-
 testdata/lvs/double_height2_texts.lvsdb       |  8 +-
 testdata/lvs/empty_subcells.lvsdb             |  4 +-
 testdata/lvs/flag_missing_ports.lvsdb         |  4 +-
 testdata/lvs/floating.lvsdb                   |  6 +-
 testdata/lvs/invchain_cheat.lvsdb             | 34 ++++----
 testdata/lvs/layer_names.lvsdb                |  6 +-
 testdata/lvs/must_connect1.lvsdb              | 18 ++---
 testdata/lvs/must_connect1_tl.lvsdb           | 18 ++---
 testdata/lvs/must_connect2.lvsdb              | 18 ++---
 testdata/lvs/must_connect3.lvsdb              | 16 ++--
 testdata/lvs/nand2_split_gate.lvsdb.1         |  2 +-
 testdata/lvs/nand2_split_gate.lvsdb.2         |  2 +-
 testdata/lvs/nand2_split_gate_early.lvsdb.1   |  2 +-
 testdata/lvs/nand2_split_gate_early.lvsdb.2   |  2 +-
 testdata/lvs/res_combine1.lvsdb.1             |  2 +-
 testdata/lvs/res_combine1.lvsdb.2             |  2 +-
 testdata/lvs/res_combine1.lvsdb.3             |  2 +-
 testdata/lvs/res_combine1.lvsdb.4             |  2 +-
 testdata/lvs/res_combine1.lvsdb.5             |  2 +-
 testdata/lvs/res_combine1.lvsdb.6             |  2 +-
 testdata/lvs/res_combine2.lvsdb.1             |  2 +-
 testdata/lvs/res_combine2.lvsdb.2             |  2 +-
 testdata/lvs/res_combine2.lvsdb.3             |  2 +-
 testdata/lvs/res_combine2.lvsdb.4             |  2 +-
 testdata/lvs/res_combine2.lvsdb.5             |  2 +-
 testdata/lvs/res_combine2.lvsdb.6             |  2 +-
 testdata/lvs/res_combine3.lvsdb.1             |  2 +-
 testdata/lvs/res_combine3.lvsdb.2             |  2 +-
 testdata/lvs/res_combine3.lvsdb.3             |  2 +-
 testdata/lvs/res_combine3.lvsdb.4             |  2 +-
 testdata/lvs/res_combine3.lvsdb.5             |  2 +-
 testdata/lvs/res_combine3.lvsdb.6             |  2 +-
 testdata/lvs/ringo_device_subcircuits.lvsdb.1 | 24 +++---
 testdata/lvs/ringo_device_subcircuits.lvsdb.2 | 24 +++---
 testdata/lvs/ringo_layout_var.lvsdb.1         | 26 +++---
 testdata/lvs/ringo_layout_var.lvsdb.2         | 26 +++---
 testdata/lvs/ringo_mixed_hierarchy.lvsdb      |  4 +-
 testdata/lvs/ringo_simple.lvsdb.1             | 24 +++---
 testdata/lvs/ringo_simple.lvsdb.2             | 24 +++---
 testdata/lvs/ringo_simple_blackboxing.lvsdb   |  8 +-
 .../lvs/ringo_simple_blackboxing_netter.lvsdb |  8 +-
 testdata/lvs/ringo_simple_compare2.lvsdb.1    | 24 +++---
 testdata/lvs/ringo_simple_compare2.lvsdb.2    | 24 +++---
 .../lvs/ringo_simple_device_scaling.lvsdb.1   | 24 +++---
 .../lvs/ringo_simple_device_scaling.lvsdb.2   | 24 +++---
 testdata/lvs/ringo_simple_dmos.lvsdb.1        | 26 +++---
 testdata/lvs/ringo_simple_dmos.lvsdb.2        | 26 +++---
 testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1  | 26 +++---
 testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2  | 26 +++---
 .../lvs/ringo_simple_dummy_device.lvsdb.1     |  4 +-
 .../lvs/ringo_simple_dummy_device.lvsdb.2     |  4 +-
 .../ringo_simple_implicit_connections.lvsdb.1 | 24 +++---
 .../ringo_simple_implicit_connections.lvsdb.2 | 24 +++---
 testdata/lvs/ringo_simple_io.lvsdb.1          | 24 +++---
 testdata/lvs/ringo_simple_io.lvsdb.2          | 24 +++---
 testdata/lvs/ringo_simple_io2.l2n.1           | 24 +++---
 testdata/lvs/ringo_simple_io2.l2n.2           | 24 +++---
 testdata/lvs/ringo_simple_io2.lvsdb.1         | 24 +++---
 testdata/lvs/ringo_simple_io2.lvsdb.2         | 24 +++---
 ...simple_net_and_circuit_equivalence.lvsdb.1 | 24 +++---
 ...simple_net_and_circuit_equivalence.lvsdb.2 | 24 +++---
 .../lvs/ringo_simple_pin_swapping.lvsdb.1     | 24 +++---
 .../lvs/ringo_simple_pin_swapping.lvsdb.2     | 24 +++---
 .../ringo_simple_same_device_classes.lvsdb.1  | 24 +++---
 .../ringo_simple_same_device_classes.lvsdb.2  | 24 +++---
 .../lvs/ringo_simple_simplification.lvsdb.1   | 14 ++--
 .../lvs/ringo_simple_simplification.lvsdb.2   | 14 ++--
 ...o_simple_simplification_with_align.lvsdb.1 | 14 ++--
 ...o_simple_simplification_with_align.lvsdb.2 | 14 ++--
 testdata/lvs/ringo_simple_with_tol.lvsdb.1    | 24 +++---
 testdata/lvs/ringo_simple_with_tol.lvsdb.2    | 24 +++---
 .../lvs/ringo_simple_with_tol_early.lvsdb.1   | 24 +++---
 .../lvs/ringo_simple_with_tol_early.lvsdb.2   | 24 +++---
 testdata/lvs/soft_connect1.l2n                | 12 +--
 testdata/lvs/soft_connect1a.l2n               | 12 +--
 testdata/lvs/soft_connect2.l2n                | 12 +--
 testdata/lvs/soft_connect3.l2n                | 18 ++---
 testdata/lvs/soft_connect4.l2n                |  4 +-
 testdata/lvs/soft_connect5.l2n                |  4 +-
 testdata/lvs/soft_connect6.l2n                |  4 +-
 testdata/lvs/stray_texts1.l2n                 | 16 ++--
 testdata/lvs/stray_texts2.l2n                 | 16 ++--
 testdata/lvs/test_22a.lvsdb.1                 | 32 ++++----
 testdata/lvs/test_22a.lvsdb.2                 | 32 ++++----
 testdata/lvs/test_22a.lvsdb.3                 | 80 +++++++++----------
 testdata/lvs/test_22b.lvsdb.1                 | 32 ++++----
 testdata/lvs/test_22b.lvsdb.2                 | 32 ++++----
 testdata/lvs/test_22b.lvsdb.3                 | 80 +++++++++----------
 testdata/lvs/test_22c.lvsdb.1                 |  8 +-
 testdata/lvs/test_22c.lvsdb.2                 |  8 +-
 testdata/lvs/test_22c.lvsdb.3                 |  8 +-
 testdata/lvs/test_22d.lvsdb.1                 |  8 +-
 testdata/lvs/test_22d.lvsdb.2                 |  8 +-
 testdata/lvs/test_22d.lvsdb.3                 |  8 +-
 133 files changed, 1107 insertions(+), 1111 deletions(-)

diff --git a/src/db/db/dbLayoutToNetlistWriter.cc b/src/db/db/dbLayoutToNetlistWriter.cc
index 092e998bb..0b734b7a0 100644
--- a/src/db/db/dbLayoutToNetlistWriter.cc
+++ b/src/db/db/dbLayoutToNetlistWriter.cc
@@ -708,11 +708,8 @@ void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::Net &net,
             outp.reset (new TokenizedOutput (stream, Keys::net_key));
 
             *outp << tl::to_string (id);
-            if (! net.name ().empty ()) {
-              TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.name ());
-            } else if (net.id () != id) {
-              TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.expanded_name ());
-            }
+            //  NOTE: we always write the expanded name, so we can refer to it in log entries
+            TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.expanded_name ());
 
             *outp << endl;
 
@@ -740,11 +737,10 @@ void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::Net &net,
   if (! outp) {
 
     outp.reset (new TokenizedOutput (stream, Keys::net_key));
-    *outp << tl::to_string (id);
 
-    if (! net.name ().empty ()) {
-      TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.name ());
-    }
+    *outp << tl::to_string (id);
+    //  NOTE: we always write the expanded name, so we can refer to it in log entries
+    TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.expanded_name ());
 
     if (net.begin_properties () != net.end_properties ()) {
       *outp << endl;
diff --git a/src/lvs/unit_tests/lvsTests.cc b/src/lvs/unit_tests/lvsTests.cc
index c1aac0071..1d22da642 100644
--- a/src/lvs/unit_tests/lvsTests.cc
+++ b/src/lvs/unit_tests/lvsTests.cc
@@ -154,7 +154,7 @@ TEST(16_private)
 TEST(17_private)
 {
   test_is_long_runner ();
-  run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b_5.lvsdb");
+  run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b_6.lvsdb");
 }
 
 TEST(18_private)
@@ -172,12 +172,12 @@ TEST(19_private)
 TEST(20_private)
 {
   // test_is_long_runner ();
-  run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20_4.lvsdb");
+  run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20_5.lvsdb");
 }
 
 TEST(21_private)
 {
-  run_test (_this, "test_21.lylvs", "test_21.cir.gz", "test_21.gds.gz", true, "test_21_6.lvsdb");
+  run_test (_this, "test_21.lylvs", "test_21.cir.gz", "test_21.gds.gz", true, "test_21_7.lvsdb");
 }
 
 //  issue #1021
diff --git a/testdata/algo/l2n_reader_au.txt b/testdata/algo/l2n_reader_au.txt
index 2c615dffc..d0a1d1bad 100644
--- a/testdata/algo/l2n_reader_au.txt
+++ b/testdata/algo/l2n_reader_au.txt
@@ -113,7 +113,7 @@ circuit(INV2
  rect((-1700 -1640) (3100 6220))
 
  # Nets with their geometries
- net(1
+ net(1 name($1)
   rect(nwell (-1400 1800) (2800 2780))
   rect(diff_cont (-1510 -650) (220 220))
   rect(ntie (-510 -450) (800 680))
@@ -126,7 +126,7 @@ circuit(INV2
   rect(poly_lbl (-526 -1801) (2 2))
   rect(poly_cont (-831 -111) (220 220))
  )
- net(3
+ net(3 name($3)
   rect(poly (275 -250) (250 2500))
   rect(poly (-305 -1430) (360 360))
   rect(poly (-305 820) (250 1600))
@@ -257,13 +257,13 @@ circuit(INV2PAIR
 
  # Nets with their geometries
  net(1 name(BULK))
- net(2
+ net(2 name($2)
   rect(diff_cont (3430 3290) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -3420) (220 220))
   rect(diff_cont (-220 180) (220 220))
  )
- net(3
+ net(3 name($3)
   rect(diff_cont (4230 3290) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -277,7 +277,7 @@ circuit(INV2PAIR
   rect(metal1 (-3000 -760) (360 760))
   rect(metal1 (-360 -760) (360 760))
  )
- net(4
+ net(4 name($4)
   rect(diff_cont (4230 490) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -291,20 +291,20 @@ circuit(INV2PAIR
   rect(metal1 (-3000 -760) (360 760))
   rect(metal1 (-360 -760) (360 760))
  )
- net(5
+ net(5 name($5)
   rect(diff_cont (2390 3690) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(6)
- net(7
+ net(6 name($6))
+ net(7 name($7)
   rect(diff_cont (5030 3690) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(8)
+ net(8 name($8))
 
  # Outgoing pins and their connections to nets
  pin(1 name(BULK))
@@ -507,25 +507,25 @@ circuit(RINGO
   rect(metal1 (-360 -760) (360 760))
   rect(metal2_lbl (-21301 -381) (2 2))
  )
- net(5
+ net(5 name($5)
   rect(diff_cont (3330 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(6
+ net(6 name($6)
   rect(diff_cont (19170 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(7
+ net(7 name($7)
   rect(diff_cont (13890 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(8
+ net(8 name($8)
   rect(diff_cont (8610 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
diff --git a/testdata/algo/l2n_reader_au_4.l2n b/testdata/algo/l2n_reader_au_4.l2n
index 67424186c..0e9dc8d4a 100644
--- a/testdata/algo/l2n_reader_au_4.l2n
+++ b/testdata/algo/l2n_reader_au_4.l2n
@@ -131,7 +131,7 @@ device(D$NMOS$3 NMOS
 circuit(INV2X
 
  # Nets with their geometries
- net(1
+ net(1 name($1)
   rect($3 (-125 700) (250 1500))
   rect($3 (-125 -1000) (800 500))
   rect($3 (-125 -1000) (250 1500))
@@ -140,7 +140,7 @@ circuit(INV2X
   rect($3 (550 -4500) (250 1600))
   rect($3 (-1050 -1600) (250 1600))
  )
- net(2
+ net(2 name($2)
   rect($4 (1090 2590) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-1820 -620) (220 220))
@@ -155,7 +155,7 @@ circuit(INV2X
   rect($1 (-975 -1075) (525 950))
   rect($1 (-2100 -950) (525 950))
  )
- net(3
+ net(3 name($3)
   rect($4 (1090 -310) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-1820 -620) (220 220))
@@ -170,7 +170,7 @@ circuit(INV2X
   rect($2 (-975 -1075) (525 950))
   rect($2 (-2100 -950) (525 950))
  )
- net(4
+ net(4 name($4)
   rect($4 (290 2590) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-220 -620) (220 220))
@@ -238,7 +238,7 @@ circuit(INV2X
 circuit(NAND1X
 
  # Nets with their geometries
- net(1
+ net(1 name($1)
   rect($4 (290 2590) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-220 -620) (220 220))
@@ -254,7 +254,7 @@ circuit(NAND1X
   rect($1 (-1255 2045) (550 950))
   rect($2 (250 -3850) (525 950))
  )
- net(2
+ net(2 name($2)
   rect($4 (1090 2590) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-1820 -620) (220 220))
@@ -269,7 +269,7 @@ circuit(NAND1X
   rect($1 (-975 -1075) (525 950))
   rect($1 (-2100 -950) (525 950))
  )
- net(3
+ net(3 name($3)
   rect($4 (-510 -310) (220 220))
   rect($4 (-220 180) (220 220))
   rect($6 (-290 -690) (360 760))
@@ -278,17 +278,17 @@ circuit(NAND1X
   rect($8 (-810 -510) (3000 1200))
   rect($2 (-2550 -1075) (525 950))
  )
- net(4
+ net(4 name($4)
   rect($3 (-125 700) (250 1500))
   rect($3 (-250 -100) (250 1600))
   rect($3 (-250 -4500) (250 1600))
  )
- net(5
+ net(5 name($5)
   rect($3 (675 700) (250 1500))
   rect($3 (-250 -100) (250 1600))
   rect($3 (-250 -4500) (250 1600))
  )
- net(6
+ net(6 name($6)
   rect($4 (290 -310) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-220 -620) (220 220))
@@ -359,7 +359,7 @@ circuit(NAND1X
 circuit(INV2ALT
 
  # Nets with their geometries
- net(1
+ net(1 name($1)
   rect($3 (675 600) (250 2300))
   rect($3 (-250 0) (1050 200))
   rect($3 (-1725 -1900) (800 500))
@@ -370,7 +370,7 @@ circuit(INV2ALT
   rect($3 (-2400 3350) (1600 250))
   rect($3 (-1825 -2325) (250 1600))
  )
- net(2
+ net(2 name($2)
   rect($4 (290 -310) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-220 2280) (220 220))
@@ -390,7 +390,7 @@ circuit(INV2ALT
   rect($2 (575 -2550) (950 525))
   rect($2 (-2050 -1825) (525 950))
  )
- net(3
+ net(3 name($3)
   rect($4 (990 4590) (220 220))
   rect($4 (-620 -220) (220 220))
   rect($4 (-1320 -2220) (220 220))
@@ -405,7 +405,7 @@ circuit(INV2ALT
   rect($1 (625 2125) (950 525))
   rect($1 (-2025 -2525) (525 950))
  )
- net(4
+ net(4 name($4)
   rect($4 (1390 190) (220 220))
   rect($4 (180 -220) (220 220))
   rect($4 (-2520 -720) (220 220))
@@ -471,7 +471,7 @@ circuit(INV2ALT
 circuit(RINGO
 
  # Nets with their geometries
- net(1
+ net(1 name($1)
   rect($3 (1700 1100) (1300 400))
   rect($4 (-2710 1090) (220 220))
   rect($4 (-220 180) (220 220))
@@ -484,7 +484,7 @@ circuit(RINGO
   rect($5 (1290 890) (200 200))
   rect($6 (-1500 -300) (1600 400))
  )
- net(2
+ net(2 name($2)
   rect($3 (4700 1100) (1300 400))
   rect($4 (-2710 1090) (220 220))
   rect($4 (-220 180) (220 220))
@@ -497,7 +497,7 @@ circuit(RINGO
   rect($5 (1290 890) (200 200))
   rect($6 (-1500 -300) (1600 400))
  )
- net(3
+ net(3 name($3)
   rect($3 (15000 1100) (1300 400))
   rect($4 (-4910 -1810) (220 220))
   rect($4 (-220 180) (220 220))
@@ -510,7 +510,7 @@ circuit(RINGO
   rect($5 (3190 -2810) (200 200))
   rect($6 (-2400 -300) (2500 400))
  )
- net(4
+ net(4 name($4)
   rect($3 (18000 1100) (1300 400))
   rect($4 (-2710 1090) (220 220))
   rect($4 (-220 180) (220 220))
@@ -523,7 +523,7 @@ circuit(RINGO
   rect($5 (1290 890) (200 200))
   rect($6 (-1500 -300) (1600 400))
  )
- net(5
+ net(5 name($5)
   rect($3 (21000 1100) (1300 400))
   rect($4 (-2710 1090) (220 220))
   rect($4 (-220 180) (220 220))
@@ -536,7 +536,7 @@ circuit(RINGO
   rect($5 (1290 890) (200 200))
   rect($6 (-1500 -300) (1600 400))
  )
- net(6
+ net(6 name($6)
   rect($3 (24000 1100) (1300 400))
   rect($4 (-2710 1090) (220 220))
   rect($4 (-220 180) (220 220))
@@ -549,7 +549,7 @@ circuit(RINGO
   rect($5 (1290 890) (200 200))
   rect($6 (-1500 -300) (1600 400))
  )
- net(7
+ net(7 name($7)
   rect($3 (27000 1100) (1300 400))
   rect($4 (-2710 1090) (220 220))
   rect($4 (-220 180) (220 220))
@@ -583,7 +583,7 @@ circuit(RINGO
   rect($8 (-31600 -400) (400 900))
   rect($11 (16399 -701) (2 2))
  )
- net(9
+ net(9 name($9)
   rect($3 (-1300 900) (1300 400))
   rect($4 (-2710 1290) (220 220))
   rect($4 (-220 180) (220 220))
@@ -598,7 +598,7 @@ circuit(RINGO
   rect($3 (-4000 1200) (875 500))
   rect($9 (-476 -201) (2 2))
  )
- net(11
+ net(11 name($11)
   rect($3 (9800 1100) (1300 400))
   rect($4 (-4810 1090) (220 220))
   rect($4 (-220 180) (220 220))
diff --git a/testdata/algo/l2n_reader_au_5.l2n b/testdata/algo/l2n_reader_au_5.l2n
index 8b514b029..c641eb466 100644
--- a/testdata/algo/l2n_reader_au_5.l2n
+++ b/testdata/algo/l2n_reader_au_5.l2n
@@ -115,7 +115,7 @@ circuit(INV2
   rect($9 (-526 -1801) (2 2))
   rect($5 (-831 -111) (220 220))
  )
- net(2
+ net(2 name($2)
   rect($3 (275 -250) (250 2500))
   rect($3 (-305 -1430) (360 360))
   rect($3 (-305 820) (250 1600))
@@ -144,7 +144,7 @@ circuit(INV2
   rect($1 (-276 524) (525 950))
   rect($2 (-525 -3750) (525 950))
  )
- net(4
+ net(4 name($4)
   rect($4 (-110 -310) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-220 -220) (220 220))
@@ -156,7 +156,7 @@ circuit(INV2
   rect($8 (-1525 -775) (2800 900))
   rect($2 (-1675 -925) (550 950))
  )
- net(5
+ net(5 name($5)
   rect($4 (-110 2490) (220 220))
   rect($4 (-220 180) (220 220))
   rect($4 (-220 -220) (220 220))
@@ -367,55 +367,55 @@ circuit(RINGO
   rect($6 (-360 -760) (360 760))
   rect($11 (-23941 -381) (2 2))
  )
- net(4
+ net(4 name($4)
   rect($4 (690 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(5
+ net(5 name($5)
   rect($4 (21810 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(6
+ net(6 name($6)
   rect($4 (19170 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(7
+ net(7 name($7)
   rect($4 (16530 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(8
+ net(8 name($8)
   rect($4 (13890 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(9
+ net(9 name($9)
   rect($4 (11250 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(10
+ net(10 name($10)
   rect($4 (8610 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(11
+ net(11 name($11)
   rect($4 (5970 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
   rect($4 (-220 -620) (220 220))
  )
- net(12
+ net(12 name($12)
   rect($4 (3330 2890) (220 220))
   rect($4 (-220 -620) (220 220))
   rect($4 (-220 -2620) (220 220))
diff --git a/testdata/algo/l2n_reader_au_7.l2n b/testdata/algo/l2n_reader_au_7.l2n
index e4a9f1a1b..c2528e43b 100644
--- a/testdata/algo/l2n_reader_au_7.l2n
+++ b/testdata/algo/l2n_reader_au_7.l2n
@@ -333,7 +333,7 @@ circuit(TOP
   rect(l15 (-980 -270) (1080 370))
   rect(l16 (-540 -190) (0 0))
  )
- net(3
+ net(3 name($3)
   rect(l11 (-5830 13120) (170 170))
   rect(l11 (-170 -850) (170 170))
   rect(l11 (-170 170) (170 170))
diff --git a/testdata/algo/l2n_reader_in.txt b/testdata/algo/l2n_reader_in.txt
index 15276f97a..5c15403a0 100644
--- a/testdata/algo/l2n_reader_in.txt
+++ b/testdata/algo/l2n_reader_in.txt
@@ -98,7 +98,7 @@ circuit(INV2
   text(poly_lbl IN (-525 -1800))
   rect(poly_cont (-830 -110) (220 220))
  )
- net(2
+ net(2 name($2)
   rect(poly (275 -250) (250 2500))
   rect(poly (-305 -1430) (360 360))
   rect(poly (-305 820) (250 1600))
@@ -127,7 +127,7 @@ circuit(INV2
   rect(psd (-275 525) (525 950))
   rect(nsd (-525 -3750) (525 950))
  )
- net(4
+ net(4 name($4)
   rect(diff_cont (-110 -310) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -139,7 +139,7 @@ circuit(INV2
   rect(metal2 (-1525 -775) (2800 900))
   rect(nsd (-1675 -925) (550 950))
  )
- net(5
+ net(5 name($5)
   rect(diff_cont (-110 2490) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -234,24 +234,24 @@ circuit(RINGO
  net(4 name(VDD)
   text(metal2_lbl VDD (0 2800))
  )
- net(5)
- net(6)
- net(7)
- net(8)
- net(9)
- net(10)
- net(11)
- net(12)
- net(13)
- net(14)
- net(15)
- net(16)
- net(17)
- net(18)
- net(19)
- net(20)
- net(21)
- net(22)
+ net(5 name($5))
+ net(6 name($6))
+ net(7 name($7))
+ net(8 name($8))
+ net(9 name($9))
+ net(10 name($10))
+ net(11 name($11))
+ net(12 name($12))
+ net(13 name($13))
+ net(14 name($14))
+ net(15 name($15))
+ net(16 name($16))
+ net(17 name($17))
+ net(18 name($18))
+ net(19 name($19))
+ net(20 name($20))
+ net(21 name($21))
+ net(22 name($22))
 
  # Outgoing pins and their connections to nets
  pin(1 name(FB))
diff --git a/testdata/algo/l2n_reader_in_p.txt b/testdata/algo/l2n_reader_in_p.txt
index 84e52624e..596256d9f 100644
--- a/testdata/algo/l2n_reader_in_p.txt
+++ b/testdata/algo/l2n_reader_in_p.txt
@@ -79,7 +79,7 @@ X(INV2
   J(poly_lbl IN (-525 -1800))
   R(poly_cont (-830 -110) (220 220))
  )
- N(2
+ N(2 I($2)
   R(poly (275 -250) (250 2500))
   R(poly (-305 -1430) (360 360))
   R(poly (-305 820) (250 1600))
@@ -108,7 +108,7 @@ X(INV2
   R(psd (-275 525) (525 950))
   R(nsd (-525 -3750) (525 950))
  )
- N(4
+ N(4 I($4)
   R(diff_cont (-110 -310) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -120,7 +120,7 @@ X(INV2
   R(metal2 (-1525 -775) (2800 900))
   R(nsd (-1675 -925) (550 950))
  )
- N(5
+ N(5 I($5)
   R(diff_cont (-110 2490) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -215,24 +215,24 @@ X(RINGO
  N(4 I(VDD)
   J(metal2_lbl VDD (0 2800))
  )
- N(5)
- N(6)
- N(7)
- N(8)
- N(9)
- N(10)
- N(11)
- N(12)
- N(13)
- N(14)
- N(15)
- N(16)
- N(17)
- N(18)
- N(19)
- N(20)
- N(21)
- N(22)
+ N(5 I($5))
+ N(6 I($6))
+ N(7 I($7))
+ N(8 I($8))
+ N(9 I($9))
+ N(10 I($10))
+ N(11 I($11))
+ N(12 I($12))
+ N(13 I($13))
+ N(14 I($14))
+ N(15 I($15))
+ N(16 I($16))
+ N(17 I($17))
+ N(18 I($18))
+ N(19 I($19))
+ N(20 I($20))
+ N(21 I($21))
+ N(22 I($22))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VSS))
diff --git a/testdata/algo/l2n_reader_in_s.txt b/testdata/algo/l2n_reader_in_s.txt
index fe37600ce..5039abb5b 100644
--- a/testdata/algo/l2n_reader_in_s.txt
+++ b/testdata/algo/l2n_reader_in_s.txt
@@ -79,7 +79,7 @@ X(INV2
   J(poly_lbl IN (-525 -1800))
   R(poly_cont (-830 -110) (220 220))
  )
- N(2
+ N(2 I($2)
   R(poly (275 -250) (250 2500))
   R(poly (-305 -1430) (360 360))
   R(poly (-305 820) (250 1600))
@@ -108,7 +108,7 @@ X(INV2
   R(psd (-275 525) (525 950))
   R(nsd (-525 -3750) (525 950))
  )
- N(4
+ N(4 I($4)
   R(diff_cont (-110 -310) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -120,7 +120,7 @@ X(INV2
   R(metal2 (-1525 -775) (2800 900))
   R(nsd (-1675 -925) (550 950))
  )
- N(5
+ N(5 I($5)
   R(diff_cont (-110 2490) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -206,24 +206,24 @@ X(RINGO
  N(4 I(VDD)
   J(metal2_lbl VDD (0 2800))
  )
- N(5)
- N(6)
- N(7)
- N(8)
- N(9)
- N(10)
- N(11)
- N(12)
- N(13)
- N(14)
- N(15)
- N(16)
- N(17)
- N(18)
- N(19)
- N(20)
- N(21)
- N(22)
+ N(5 I($5))
+ N(6 I($6))
+ N(7 I($7))
+ N(8 I($8))
+ N(9 I($9))
+ N(10 I($10))
+ N(11 I($11))
+ N(12 I($12))
+ N(13 I($13))
+ N(14 I($14))
+ N(15 I($15))
+ N(16 I($16))
+ N(17 I($17))
+ N(18 I($18))
+ N(19 I($19))
+ N(20 I($20))
+ N(21 I($21))
+ N(22 I($22))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VSS))
diff --git a/testdata/algo/l2n_writer_au.txt b/testdata/algo/l2n_writer_au.txt
index 15276f97a..23b74e85a 100644
--- a/testdata/algo/l2n_writer_au.txt
+++ b/testdata/algo/l2n_writer_au.txt
@@ -98,7 +98,7 @@ circuit(INV2
   text(poly_lbl IN (-525 -1800))
   rect(poly_cont (-830 -110) (220 220))
  )
- net(2
+ net(2 name($2)
   rect(poly (275 -250) (250 2500))
   rect(poly (-305 -1430) (360 360))
   rect(poly (-305 820) (250 1600))
@@ -127,7 +127,7 @@ circuit(INV2
   rect(psd (-275 525) (525 950))
   rect(nsd (-525 -3750) (525 950))
  )
- net(4
+ net(4 name($4)
   rect(diff_cont (-110 -310) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -139,7 +139,7 @@ circuit(INV2
   rect(metal2 (-1525 -775) (2800 900))
   rect(nsd (-1675 -925) (550 950))
  )
- net(5
+ net(5 name($5)
   rect(diff_cont (-110 2490) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -234,24 +234,24 @@ circuit(RINGO
  net(4 name(VDD)
   text(metal2_lbl VDD (0 2800))
  )
- net(5)
- net(6)
- net(7)
- net(8)
- net(9)
- net(10)
- net(11)
- net(12)
- net(13)
- net(14)
- net(15)
- net(16)
- net(17)
- net(18)
- net(19)
- net(20)
- net(21)
- net(22)
+ net(5 name($I46))
+ net(6 name($I45))
+ net(7 name($I44))
+ net(8 name($I43))
+ net(9 name($I42))
+ net(10 name($I41))
+ net(11 name($I40))
+ net(12 name($I39))
+ net(13 name($I38))
+ net(14 name($I19))
+ net(15 name($I8))
+ net(16 name($I7))
+ net(17 name($I6))
+ net(18 name($I5))
+ net(19 name($I4))
+ net(20 name($I3))
+ net(21 name($I2))
+ net(22 name($I1))
 
  # Outgoing pins and their connections to nets
  pin(1 name(FB))
diff --git a/testdata/algo/l2n_writer_au_2b.txt b/testdata/algo/l2n_writer_au_2b.txt
index d0986d5a1..0137b1b11 100644
--- a/testdata/algo/l2n_writer_au_2b.txt
+++ b/testdata/algo/l2n_writer_au_2b.txt
@@ -113,7 +113,7 @@ circuit(INV2
  rect((-1700 -1640) (3100 6220))
 
  # Nets with their geometries
- net(1
+ net(1 name($1)
   rect(nwell (-1400 1800) (2800 2780))
   rect(diff_cont (-1510 -650) (220 220))
   rect(ntie (-510 -450) (800 680))
@@ -126,7 +126,7 @@ circuit(INV2
   rect(poly_lbl (-525 -1800) (0 0))
   rect(poly_cont (-830 -110) (220 220))
  )
- net(3
+ net(3 name($3)
   rect(poly (275 -250) (250 2500))
   rect(poly (-305 -1430) (360 360))
   rect(poly (-305 820) (250 1600))
@@ -257,14 +257,14 @@ circuit(INV2PAIR
 
  # Nets with their geometries
  net(1 name(BULK))
- net(2)
- net(3)
- net(4)
- net(5)
- net(6)
- net(7)
- net(8)
- net(9)
+ net(2 name($I8))
+ net(3 name($I7))
+ net(4 name($I6))
+ net(5 name($I5))
+ net(6 name($I4))
+ net(7 name($I3))
+ net(8 name($I2))
+ net(9 name($I1))
 
  # Outgoing pins and their connections to nets
  pin(1 name(BULK))
@@ -340,14 +340,14 @@ circuit(RINGO
   rect(metal1 (2280 -1120) (360 1120))
   rect(metal2_lbl (-23940 300) (0 0))
  )
- net(5)
- net(6)
- net(7)
- net(8)
- net(9)
- net(10)
- net(11)
- net(12)
+ net(5 name($I25))
+ net(6 name($I24))
+ net(7 name($I23))
+ net(8 name($I22))
+ net(9 name($I17))
+ net(10 name($I11))
+ net(11 name($I10))
+ net(12 name($I9))
 
  # Outgoing pins and their connections to nets
  pin(1 name(FB))
diff --git a/testdata/algo/l2n_writer_au_2s.txt b/testdata/algo/l2n_writer_au_2s.txt
index e221c3892..b03978d7e 100644
--- a/testdata/algo/l2n_writer_au_2s.txt
+++ b/testdata/algo/l2n_writer_au_2s.txt
@@ -92,7 +92,7 @@ D(D$NMOS$1 NMOS
 )
 X(INV2
  R((-1700 -1640) (3100 6220))
- N(1
+ N(1 I($1)
   R(nwell (-1400 1800) (2800 2780))
   R(diff_cont (-1510 -650) (220 220))
   R(ntie (-510 -450) (800 680))
@@ -105,7 +105,7 @@ X(INV2
   R(poly_lbl (-525 -1800) (0 0))
   R(poly_cont (-830 -110) (220 220))
  )
- N(3
+ N(3 I($3)
   R(poly (275 -250) (250 2500))
   R(poly (-305 -1430) (360 360))
   R(poly (-305 820) (250 1600))
@@ -227,14 +227,14 @@ X(INV2
 X(INV2PAIR
  R((0 -840) (5740 6220))
  N(1 I(BULK))
- N(2)
- N(3)
- N(4)
- N(5)
- N(6)
- N(7)
- N(8)
- N(9)
+ N(2 I($I8))
+ N(3 I($I7))
+ N(4 I($I6))
+ N(5 I($I5))
+ N(6 I($I4))
+ N(7 I($I3))
+ N(8 I($I2))
+ N(9 I($I1))
  P(1 I(BULK))
  P(2)
  P(4)
@@ -301,14 +301,14 @@ X(RINGO
   R(metal1 (2280 -1120) (360 1120))
   R(metal2_lbl (-23940 300) (0 0))
  )
- N(5)
- N(6)
- N(7)
- N(8)
- N(9)
- N(10)
- N(11)
- N(12)
+ N(5 I($I25))
+ N(6 I($I24))
+ N(7 I($I23))
+ N(8 I($I22))
+ N(9 I($I17))
+ N(10 I($I11))
+ N(11 I($I10))
+ N(12 I($I9))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VDD))
diff --git a/testdata/algo/l2n_writer_au_p.txt b/testdata/algo/l2n_writer_au_p.txt
index 84e52624e..8be488e3f 100644
--- a/testdata/algo/l2n_writer_au_p.txt
+++ b/testdata/algo/l2n_writer_au_p.txt
@@ -79,7 +79,7 @@ X(INV2
   J(poly_lbl IN (-525 -1800))
   R(poly_cont (-830 -110) (220 220))
  )
- N(2
+ N(2 I($2)
   R(poly (275 -250) (250 2500))
   R(poly (-305 -1430) (360 360))
   R(poly (-305 820) (250 1600))
@@ -108,7 +108,7 @@ X(INV2
   R(psd (-275 525) (525 950))
   R(nsd (-525 -3750) (525 950))
  )
- N(4
+ N(4 I($4)
   R(diff_cont (-110 -310) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -120,7 +120,7 @@ X(INV2
   R(metal2 (-1525 -775) (2800 900))
   R(nsd (-1675 -925) (550 950))
  )
- N(5
+ N(5 I($5)
   R(diff_cont (-110 2490) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -215,24 +215,24 @@ X(RINGO
  N(4 I(VDD)
   J(metal2_lbl VDD (0 2800))
  )
- N(5)
- N(6)
- N(7)
- N(8)
- N(9)
- N(10)
- N(11)
- N(12)
- N(13)
- N(14)
- N(15)
- N(16)
- N(17)
- N(18)
- N(19)
- N(20)
- N(21)
- N(22)
+ N(5 I($I46))
+ N(6 I($I45))
+ N(7 I($I44))
+ N(8 I($I43))
+ N(9 I($I42))
+ N(10 I($I41))
+ N(11 I($I40))
+ N(12 I($I39))
+ N(13 I($I38))
+ N(14 I($I19))
+ N(15 I($I8))
+ N(16 I($I7))
+ N(17 I($I6))
+ N(18 I($I5))
+ N(19 I($I4))
+ N(20 I($I3))
+ N(21 I($I2))
+ N(22 I($I1))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VSS))
diff --git a/testdata/algo/l2n_writer_au_s.txt b/testdata/algo/l2n_writer_au_s.txt
index fe37600ce..d63409be9 100644
--- a/testdata/algo/l2n_writer_au_s.txt
+++ b/testdata/algo/l2n_writer_au_s.txt
@@ -79,7 +79,7 @@ X(INV2
   J(poly_lbl IN (-525 -1800))
   R(poly_cont (-830 -110) (220 220))
  )
- N(2
+ N(2 I($2)
   R(poly (275 -250) (250 2500))
   R(poly (-305 -1430) (360 360))
   R(poly (-305 820) (250 1600))
@@ -108,7 +108,7 @@ X(INV2
   R(psd (-275 525) (525 950))
   R(nsd (-525 -3750) (525 950))
  )
- N(4
+ N(4 I($4)
   R(diff_cont (-110 -310) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -120,7 +120,7 @@ X(INV2
   R(metal2 (-1525 -775) (2800 900))
   R(nsd (-1675 -925) (550 950))
  )
- N(5
+ N(5 I($5)
   R(diff_cont (-110 2490) (220 220))
   R(diff_cont (-220 180) (220 220))
   R(diff_cont (-220 -220) (220 220))
@@ -206,24 +206,24 @@ X(RINGO
  N(4 I(VDD)
   J(metal2_lbl VDD (0 2800))
  )
- N(5)
- N(6)
- N(7)
- N(8)
- N(9)
- N(10)
- N(11)
- N(12)
- N(13)
- N(14)
- N(15)
- N(16)
- N(17)
- N(18)
- N(19)
- N(20)
- N(21)
- N(22)
+ N(5 I($I46))
+ N(6 I($I45))
+ N(7 I($I44))
+ N(8 I($I43))
+ N(9 I($I42))
+ N(10 I($I41))
+ N(11 I($I40))
+ N(12 I($I39))
+ N(13 I($I38))
+ N(14 I($I19))
+ N(15 I($I8))
+ N(16 I($I7))
+ N(17 I($I6))
+ N(18 I($I5))
+ N(19 I($I4))
+ N(20 I($I3))
+ N(21 I($I2))
+ N(22 I($I1))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VSS))
diff --git a/testdata/algo/lvs_test1_au.lvsdb.1 b/testdata/algo/lvs_test1_au.lvsdb.1
index dab36afd2..56f72cfa1 100644
--- a/testdata/algo/lvs_test1_au.lvsdb.1
+++ b/testdata/algo/lvs_test1_au.lvsdb.1
@@ -116,7 +116,7 @@ layout(
   rect((-1700 -2440) (3100 7820))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(nwell (-1400 1800) (2800 3580))
    rect(diff_cont (-1510 -650) (220 220))
    rect(ntie (-510 -450) (800 680))
@@ -267,12 +267,12 @@ layout(
 
   # Nets with their geometries
   net(1 name(BULK))
-  net(2)
-  net(3)
-  net(4)
-  net(5)
-  net(6)
-  net(7)
+  net(2 name($I6))
+  net(3 name($I5))
+  net(4 name($I4))
+  net(5 name($I3))
+  net(6 name($I2))
+  net(7 name($I1))
 
   # Outgoing pins and their connections to nets
   pin(1 name(BULK))
@@ -346,14 +346,14 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal2_lbl (-23940 1100) (0 0))
   )
-  net(5)
-  net(6)
-  net(7)
-  net(8)
-  net(9)
-  net(10)
-  net(11)
-  net(12)
+  net(5 name($I25))
+  net(6 name($I24))
+  net(7 name($I23))
+  net(8 name($I22))
+  net(9 name($I17))
+  net(10 name($I11))
+  net(11 name($I10))
+  net(12 name($I9))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
diff --git a/testdata/algo/lvs_test1b_au.lvsdb.1 b/testdata/algo/lvs_test1b_au.lvsdb.1
index cd1225bf0..531ff69f8 100644
--- a/testdata/algo/lvs_test1b_au.lvsdb.1
+++ b/testdata/algo/lvs_test1b_au.lvsdb.1
@@ -116,7 +116,7 @@ layout(
   rect((-1700 -2440) (3100 7820))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(nwell (-1400 1800) (2800 3580))
    rect(diff_cont (-1510 -650) (220 220))
    rect(ntie (-510 -450) (800 680))
@@ -267,12 +267,12 @@ layout(
 
   # Nets with their geometries
   net(1 name(BULK))
-  net(2)
-  net(3)
-  net(4)
-  net(5)
-  net(6)
-  net(7)
+  net(2 name($I6))
+  net(3 name($I5))
+  net(4 name($I4))
+  net(5 name($I3))
+  net(6 name($I2))
+  net(7 name($I1))
 
   # Outgoing pins and their connections to nets
   pin(1 name(BULK))
@@ -346,14 +346,14 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal2_lbl (-23940 1100) (0 0))
   )
-  net(5)
-  net(6)
-  net(7)
-  net(8)
-  net(9)
-  net(10)
-  net(11)
-  net(12)
+  net(5 name($I25))
+  net(6 name($I24))
+  net(7 name($I23))
+  net(8 name($I22))
+  net(9 name($I17))
+  net(10 name($I11))
+  net(11 name($I10))
+  net(12 name($I9))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
diff --git a/testdata/algo/lvs_test2_au.lvsdb.1 b/testdata/algo/lvs_test2_au.lvsdb.1
index a24505189..ab2e809b0 100644
--- a/testdata/algo/lvs_test2_au.lvsdb.1
+++ b/testdata/algo/lvs_test2_au.lvsdb.1
@@ -116,7 +116,7 @@ layout(
   rect((-1700 -2440) (3100 7820))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(nwell (-1400 1800) (2800 3580))
    rect(diff_cont (-1510 -650) (220 220))
    rect(ntie (-510 -450) (800 680))
@@ -267,12 +267,12 @@ layout(
 
   # Nets with their geometries
   net(1 name(BULK))
-  net(2)
-  net(3)
-  net(4)
-  net(5)
-  net(6)
-  net(7)
+  net(2 name($I6))
+  net(3 name($I5))
+  net(4 name($I4))
+  net(5 name($I3))
+  net(6 name($I2))
+  net(7 name($I1))
 
   # Outgoing pins and their connections to nets
   pin(1 name(BULK))
@@ -346,14 +346,14 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal2_lbl (-23940 1100) (0 0))
   )
-  net(5)
-  net(6)
-  net(7)
-  net(8)
-  net(9)
-  net(10)
-  net(11)
-  net(12)
+  net(5 name($I25))
+  net(6 name($I24))
+  net(7 name($I23))
+  net(8 name($I22))
+  net(9 name($I17))
+  net(10 name($I11))
+  net(11 name($I10))
+  net(12 name($I9))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.1 b/testdata/algo/lvs_test2b_au.lvsdb.1
index ee2bd4020..ed6529e45 100644
--- a/testdata/algo/lvs_test2b_au.lvsdb.1
+++ b/testdata/algo/lvs_test2b_au.lvsdb.1
@@ -116,7 +116,7 @@ layout(
   rect((-1700 -2440) (3100 7820))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(nwell (-1400 1800) (2800 3580))
    rect(diff_cont (-1510 -650) (220 220))
    rect(ntie (-510 -450) (800 680))
@@ -267,12 +267,12 @@ layout(
 
   # Nets with their geometries
   net(1 name(BULK))
-  net(2)
-  net(3)
-  net(4)
-  net(5)
-  net(6)
-  net(7)
+  net(2 name($I6))
+  net(3 name($I5))
+  net(4 name($I4))
+  net(5 name($I3))
+  net(6 name($I2))
+  net(7 name($I1))
 
   # Outgoing pins and their connections to nets
   pin(1 name(BULK))
@@ -346,14 +346,14 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal2_lbl (-23940 1100) (0 0))
   )
-  net(5)
-  net(6)
-  net(7)
-  net(8)
-  net(9)
-  net(10)
-  net(11)
-  net(12)
+  net(5 name($I25))
+  net(6 name($I24))
+  net(7 name($I23))
+  net(8 name($I22))
+  net(9 name($I17))
+  net(10 name($I11))
+  net(11 name($I10))
+  net(12 name($I9))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
diff --git a/testdata/algo/lvs_test3_au.lvsdb b/testdata/algo/lvs_test3_au.lvsdb
index 617d84271..dab89637b 100644
--- a/testdata/algo/lvs_test3_au.lvsdb
+++ b/testdata/algo/lvs_test3_au.lvsdb
@@ -116,7 +116,7 @@ layout(
   rect((-1700 -2440) (3100 7820))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(nwell (-1400 1800) (2800 3580))
    rect(diff_cont (-1510 -650) (220 220))
    rect(ntie (-510 -450) (800 680))
@@ -267,12 +267,12 @@ layout(
 
   # Nets with their geometries
   net(1 name(BULK))
-  net(2)
-  net(3)
-  net(4)
-  net(5)
-  net(6)
-  net(7)
+  net(2 name($2))
+  net(3 name($3))
+  net(4 name($4))
+  net(5 name($5))
+  net(6 name($6))
+  net(7 name($7))
 
   # Outgoing pins and their connections to nets
   pin(1 name(BULK))
@@ -346,14 +346,14 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal2_lbl (-23940 1100) (0 0))
   )
-  net(5)
-  net(6)
-  net(7)
-  net(8)
-  net(9)
-  net(10)
-  net(11)
-  net(12)
+  net(5 name($5))
+  net(6 name($6))
+  net(7 name($7))
+  net(8 name($8))
+  net(9 name($9))
+  net(10 name($10))
+  net(11 name($11))
+  net(12 name($12))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
diff --git a/testdata/drc/drcSimpleTests_au122.l2n b/testdata/drc/drcSimpleTests_au122.l2n
index d34f94a3f..469ce6ba3 100644
--- a/testdata/drc/drcSimpleTests_au122.l2n
+++ b/testdata/drc/drcSimpleTests_au122.l2n
@@ -27,7 +27,7 @@ D(D$MOS MOS
 )
 X(A
  R((-2800 -2500) (5600 5200))
- N(1
+ N(1 I($1)
   R(contact (-1900 2000) (600 600))
   R(contact (-600 -600) (600 600))
   R(contact (2600 -600) (600 600))
@@ -36,13 +36,13 @@ X(A
   R(contact (-600 -600) (600 600))
   R(sd (-2300 -700) (4000 800))
  )
- N(2
+ N(2 I($2)
   R(contact (-1900 -2400) (600 600))
   R(contact (2600 -600) (600 600))
   R(contact (-2200 -600) (600 600))
   R(sd (-2300 -700) (4000 800))
  )
- N(3
+ N(3 I($3)
   R(poly (-2800 -1700) (5600 3600))
  )
  P(1)
@@ -63,9 +63,9 @@ X(A
 )
 X(AA
  R((-2050 -1950) (5600 5200))
- N(1)
- N(2)
- N(3)
+ N(1 I($I3))
+ N(2 I($I2))
+ N(3 I($I1))
  P(1)
  P(2)
  P(3)
@@ -94,10 +94,10 @@ X(TOP
   R(contact (-1200 -1600) (600 600))
   R(contact (1000 -600) (600 600))
  )
- N(3
+ N(3 I($3)
   R(l1 (-2350 8300) (4000 850))
  )
- N(4
+ N(4 I($4)
   R(l1 (-2800 -2800) (800 4100))
  )
  X(1 AA Y(-1100 5900)
diff --git a/testdata/lvs/bbdevices1.lvsdb b/testdata/lvs/bbdevices1.lvsdb
index 71177629c..5b56c62b6 100644
--- a/testdata/lvs/bbdevices1.lvsdb
+++ b/testdata/lvs/bbdevices1.lvsdb
@@ -188,7 +188,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -207,7 +207,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices1b.lvsdb b/testdata/lvs/bbdevices1b.lvsdb
index ec7a60026..8005ca7b5 100644
--- a/testdata/lvs/bbdevices1b.lvsdb
+++ b/testdata/lvs/bbdevices1b.lvsdb
@@ -118,7 +118,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -137,7 +137,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices2.lvsdb b/testdata/lvs/bbdevices2.lvsdb
index 0f2a44006..407117c0e 100644
--- a/testdata/lvs/bbdevices2.lvsdb
+++ b/testdata/lvs/bbdevices2.lvsdb
@@ -192,7 +192,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -211,13 +211,13 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($3)
    rect(l2 (-401420 456500) (50730 78500))
   )
-  net(4
+  net(4 name($4)
    rect(l2 (822690 427000) (63970 82000))
   )
   net(5 name($7)
diff --git a/testdata/lvs/bbdevices2b.lvsdb b/testdata/lvs/bbdevices2b.lvsdb
index 9cd9cc391..459b27469 100644
--- a/testdata/lvs/bbdevices2b.lvsdb
+++ b/testdata/lvs/bbdevices2b.lvsdb
@@ -122,7 +122,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -141,13 +141,13 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
-  net(3
+  net(3 name($3)
    rect(l2 (-401420 456500) (50730 78500))
   )
-  net(4
+  net(4 name($4)
    rect(l2 (822690 427000) (63970 82000))
   )
   net(5 name($7)
diff --git a/testdata/lvs/bbdevices3.lvsdb b/testdata/lvs/bbdevices3.lvsdb
index 3ab3475c0..def2c167b 100644
--- a/testdata/lvs/bbdevices3.lvsdb
+++ b/testdata/lvs/bbdevices3.lvsdb
@@ -188,7 +188,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -207,7 +207,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices3b.lvsdb b/testdata/lvs/bbdevices3b.lvsdb
index f60bc5bab..54f8a1495 100644
--- a/testdata/lvs/bbdevices3b.lvsdb
+++ b/testdata/lvs/bbdevices3b.lvsdb
@@ -118,7 +118,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -137,7 +137,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices4.lvsdb b/testdata/lvs/bbdevices4.lvsdb
index 0a74172f8..b56688d9f 100644
--- a/testdata/lvs/bbdevices4.lvsdb
+++ b/testdata/lvs/bbdevices4.lvsdb
@@ -185,7 +185,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -204,7 +204,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices4b.lvsdb b/testdata/lvs/bbdevices4b.lvsdb
index ba1dfd285..a711228ae 100644
--- a/testdata/lvs/bbdevices4b.lvsdb
+++ b/testdata/lvs/bbdevices4b.lvsdb
@@ -115,7 +115,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -134,7 +134,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices5.lvsdb b/testdata/lvs/bbdevices5.lvsdb
index 6b5dee81b..3eae842f5 100644
--- a/testdata/lvs/bbdevices5.lvsdb
+++ b/testdata/lvs/bbdevices5.lvsdb
@@ -188,7 +188,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -207,7 +207,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices5b.lvsdb b/testdata/lvs/bbdevices5b.lvsdb
index 7e9f9b4c0..44b974382 100644
--- a/testdata/lvs/bbdevices5b.lvsdb
+++ b/testdata/lvs/bbdevices5b.lvsdb
@@ -118,7 +118,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -137,7 +137,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l2 (-148000 463000) (300000 25000))
   )
   net(3 name($5)
diff --git a/testdata/lvs/bbdevices6.lvsdb b/testdata/lvs/bbdevices6.lvsdb
index b0264ad49..a788c4b0f 100644
--- a/testdata/lvs/bbdevices6.lvsdb
+++ b/testdata/lvs/bbdevices6.lvsdb
@@ -188,7 +188,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -207,7 +207,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -223,7 +223,7 @@ layout(
    rect(l14 (186500 -16500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(3
+  net(3 name($3)
    rect(l2 (-148000 463000) (300000 25000))
   )
 
diff --git a/testdata/lvs/bbdevices6b.lvsdb b/testdata/lvs/bbdevices6b.lvsdb
index b75d0a8e5..afab7208e 100644
--- a/testdata/lvs/bbdevices6b.lvsdb
+++ b/testdata/lvs/bbdevices6b.lvsdb
@@ -118,7 +118,7 @@ layout(
   rect((-577500 -1123000) (1868000 1796000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l2 (345500 455000) (256500 25000))
    rect(l2 (-256500 -146000) (25000 146000))
    rect(l2 (-47000 -183500) (75000 75000))
@@ -137,7 +137,7 @@ layout(
    rect(l10 (-57500 -57500) (25000 25000))
    rect(l11 (-25000 -25000) (25000 25000))
   )
-  net(2
+  net(2 name($2)
    rect(l9 (348500 26500) (25000 179000))
    rect(l9 (-57500 -58000) (90000 90000))
    rect(l9 (-86000 -288500) (90000 90000))
@@ -153,7 +153,7 @@ layout(
    rect(l14 (186500 -16500) (25000 193000))
    rect(l14 (-87500 -87500) (150000 150000))
   )
-  net(3
+  net(3 name($3)
    rect(l2 (-148000 463000) (300000 25000))
   )
 
diff --git a/testdata/lvs/blackbox3.lvsdb b/testdata/lvs/blackbox3.lvsdb
index 0ea7fb1e5..6e03427ab 100644
--- a/testdata/lvs/blackbox3.lvsdb
+++ b/testdata/lvs/blackbox3.lvsdb
@@ -44,7 +44,7 @@ layout(
   rect((-18500 -14000) (44500 28000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l1 (6000 -6000) (7000 1000))
    rect(l1 (-1000 0) (1000 12000))
    rect(l1 (-1000 0) (5160 1000))
diff --git a/testdata/lvs/blackbox5.lvsdb b/testdata/lvs/blackbox5.lvsdb
index 6d8f88e0a..9519d4150 100644
--- a/testdata/lvs/blackbox5.lvsdb
+++ b/testdata/lvs/blackbox5.lvsdb
@@ -44,7 +44,7 @@ layout(
   rect((-18500 -14000) (44500 28000))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l1 (6000 -6000) (7000 1000))
    rect(l1 (-1000 0) (1000 12000))
    rect(l1 (-1000 0) (4550 1000))
diff --git a/testdata/lvs/custom_resistors.l2n.1 b/testdata/lvs/custom_resistors.l2n.1
index 1047b4c0a..fd0a94687 100644
--- a/testdata/lvs/custom_resistors.l2n.1
+++ b/testdata/lvs/custom_resistors.l2n.1
@@ -29,12 +29,12 @@ D(D$RPP1$1 RPP1
 )
 X(A
  R((-200 -450) (1750 1350))
- N(1
+ N(1 I($1)
   R(l4 (-150 450) (100 100))
   R(l3 (-150 -150) (200 500))
   R(l1 (-200 -500) (250 200))
  )
- N(2
+ N(2 I($2)
   R(l4 (650 450) (100 100))
   R(l4 (-100 -900) (100 100))
   R(l3 (-150 200) (200 650))
@@ -42,7 +42,7 @@ X(A
   R(l1 (-250 300) (250 200))
   R(l1 (-200 -1000) (250 200))
  )
- N(3
+ N(3 I($3)
   R(l4 (1450 -350) (100 100))
  )
  P(1)
@@ -60,12 +60,12 @@ X(A
 )
 X(TOP
  R((-50 450) (3800 2600))
- N(1
+ N(1 I($1)
   R(l4 (850 2050) (100 100))
   R(l3 (-150 -150) (500 200))
   R(l1 (-500 -250) (200 250))
  )
- N(2
+ N(2 I($2)
   R(l4 (850 1250) (100 100))
   R(l4 (-100 -100) (100 100))
   R(l4 (-900 -100) (100 100))
@@ -74,14 +74,14 @@ X(TOP
   R(l1 (300 -250) (200 300))
   R(l1 (-1000 -300) (200 250))
  )
- N(3
+ N(3 I($3)
   R(l4 (50 450) (100 100))
  )
- N(4
+ N(4 I($4)
   R(l4 (850 450) (100 100))
  )
- N(5)
- N(6)
+ N(5 I($I2))
+ N(6 I($I1))
  D(1 D$RPP1
   Y(800 750)
   E(R 0.555555555556)
diff --git a/testdata/lvs/custom_resistors.l2n.2 b/testdata/lvs/custom_resistors.l2n.2
index 17deb7617..df87bc89f 100644
--- a/testdata/lvs/custom_resistors.l2n.2
+++ b/testdata/lvs/custom_resistors.l2n.2
@@ -29,12 +29,12 @@ D(D$RPP1$1 RPP1
 )
 X(A
  R((-200 -450) (1750 1350))
- N(1
+ N(1 I($1)
   R(l4 (-150 450) (100 100))
   R(l3 (-150 -150) (200 500))
   R(l1 (-200 -500) (250 200))
  )
- N(2
+ N(2 I($2)
   R(l4 (650 450) (100 100))
   R(l4 (-100 -900) (100 100))
   R(l3 (-150 200) (200 650))
@@ -42,7 +42,7 @@ X(A
   R(l1 (-250 300) (250 200))
   R(l1 (-200 -1000) (250 200))
  )
- N(3
+ N(3 I($3)
   R(l4 (1450 -350) (100 100))
  )
  P(1)
@@ -60,12 +60,12 @@ X(A
 )
 X(TOP
  R((-50 450) (3800 2600))
- N(1
+ N(1 I($1)
   R(l4 (850 2050) (100 100))
   R(l3 (-150 -150) (500 200))
   R(l1 (-500 -250) (200 250))
  )
- N(2
+ N(2 I($2)
   R(l4 (850 1250) (100 100))
   R(l4 (-100 -100) (100 100))
   R(l4 (-900 -100) (100 100))
@@ -74,14 +74,14 @@ X(TOP
   R(l1 (300 -250) (200 300))
   R(l1 (-1000 -300) (200 250))
  )
- N(3
+ N(3 I($3)
   R(l4 (50 450) (100 100))
  )
- N(4
+ N(4 I($4)
   R(l4 (850 450) (100 100))
  )
- N(5)
- N(6)
+ N(5 I($I2))
+ N(6 I($I1))
  D(1 D$RPP1
   Y(800 750)
   E(R 0.555555555556)
diff --git a/testdata/lvs/custom_resistors.l2n.3 b/testdata/lvs/custom_resistors.l2n.3
index 01f44b800..d75bc9430 100644
--- a/testdata/lvs/custom_resistors.l2n.3
+++ b/testdata/lvs/custom_resistors.l2n.3
@@ -29,12 +29,12 @@ D(D$RPP1$1 RPP1
 )
 X(A
  R((-200 -450) (1750 1350))
- N(1
+ N(1 I($1)
   R(l4 (-150 450) (100 100))
   R(l3 (-150 -150) (200 500))
   R(l1 (-200 -500) (250 200))
  )
- N(2
+ N(2 I($2)
   R(l4 (650 450) (100 100))
   R(l4 (-100 -900) (100 100))
   R(l3 (-150 200) (200 650))
@@ -42,7 +42,7 @@ X(A
   R(l1 (-250 300) (250 200))
   R(l1 (-200 -1000) (250 200))
  )
- N(3
+ N(3 I($3)
   R(l4 (1450 -350) (100 100))
  )
  P(1)
@@ -60,12 +60,12 @@ X(A
 )
 X(TOP
  R((-50 450) (3800 2600))
- N(1
+ N(1 I($1)
   R(l4 (850 2050) (100 100))
   R(l3 (-150 -150) (500 200))
   R(l1 (-500 -250) (200 250))
  )
- N(2
+ N(2 I($2)
   R(l4 (850 1250) (100 100))
   R(l4 (-100 -100) (100 100))
   R(l4 (-900 -100) (100 100))
@@ -74,14 +74,14 @@ X(TOP
   R(l1 (300 -250) (200 300))
   R(l1 (-1000 -300) (200 250))
  )
- N(3
+ N(3 I($3)
   R(l4 (50 450) (100 100))
  )
- N(4
+ N(4 I($4)
   R(l4 (850 450) (100 100))
  )
- N(5)
- N(6)
+ N(5 I($I2))
+ N(6 I($I1))
  D(1 D$RPP1
   Y(800 750)
   E(R 0.555555555556)
diff --git a/testdata/lvs/double_height.lvsdb b/testdata/lvs/double_height.lvsdb
index 2ad29707b..f9b66a23d 100644
--- a/testdata/lvs/double_height.lvsdb
+++ b/testdata/lvs/double_height.lvsdb
@@ -53,7 +53,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -62,7 +62,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -71,12 +71,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
@@ -159,7 +159,7 @@ J(
  )
  X(INVCHAIN
   R((-90 0) (4475 9200))
-  N(1
+  N(1 I($1)
    R(l3 (1625 1835) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
diff --git a/testdata/lvs/double_height2.lvsdb b/testdata/lvs/double_height2.lvsdb
index ff5e4200a..9f2453268 100644
--- a/testdata/lvs/double_height2.lvsdb
+++ b/testdata/lvs/double_height2.lvsdb
@@ -56,7 +56,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -65,7 +65,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -74,12 +74,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
diff --git a/testdata/lvs/double_height2_texts.lvsdb b/testdata/lvs/double_height2_texts.lvsdb
index c5b5b94bf..8462d465e 100644
--- a/testdata/lvs/double_height2_texts.lvsdb
+++ b/testdata/lvs/double_height2_texts.lvsdb
@@ -56,7 +56,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -65,7 +65,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -74,12 +74,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
diff --git a/testdata/lvs/empty_subcells.lvsdb b/testdata/lvs/empty_subcells.lvsdb
index 5a0306ccb..38b62dfbf 100644
--- a/testdata/lvs/empty_subcells.lvsdb
+++ b/testdata/lvs/empty_subcells.lvsdb
@@ -68,12 +68,12 @@ layout(
   rect((100 10) (340 80))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l1 (180 60) (90 30))
    rect(l2 (-160 -20) (90 10))
    rect(l2 (40 -10) (180 10))
   )
-  net(2
+  net(2 name($2)
    rect(l1 (180 10) (90 30))
    rect(l2 (-160 -20) (90 10))
    rect(l2 (40 -10) (180 10))
diff --git a/testdata/lvs/flag_missing_ports.lvsdb b/testdata/lvs/flag_missing_ports.lvsdb
index 10baa7f3a..dc0daa191 100644
--- a/testdata/lvs/flag_missing_ports.lvsdb
+++ b/testdata/lvs/flag_missing_ports.lvsdb
@@ -119,7 +119,7 @@ layout(
    rect(l2 (-275 -2150) (425 1500))
    rect(l2 (-400 -1500) (425 1500))
   )
-  net(2
+  net(2 name($2)
    rect(l8 (1810 1770) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-1580 3760) (180 180))
@@ -146,7 +146,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(b)
diff --git a/testdata/lvs/floating.lvsdb b/testdata/lvs/floating.lvsdb
index 3822292b2..0c5917576 100644
--- a/testdata/lvs/floating.lvsdb
+++ b/testdata/lvs/floating.lvsdb
@@ -216,7 +216,7 @@ layout(
   rect((-100 400) (5600 7600))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (3100 2950) (950 300))
   )
   net(2 name(A)
@@ -226,8 +226,8 @@ layout(
    rect(l11 (2400 3100) (0 0))
   )
   net(4 name(SUBSTRATE))
-  net(5)
-  net(6)
+  net(5 name($I3))
+  net(6 name($I1))
 
   # Outgoing pins and their connections to nets
   pin(2 name(A))
diff --git a/testdata/lvs/invchain_cheat.lvsdb b/testdata/lvs/invchain_cheat.lvsdb
index bf85c951c..0350f7576 100644
--- a/testdata/lvs/invchain_cheat.lvsdb
+++ b/testdata/lvs/invchain_cheat.lvsdb
@@ -53,7 +53,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -62,7 +62,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -71,12 +71,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
@@ -118,12 +118,12 @@ J(
  )
  X(INV2
   R((0 0) (5500 4600))
-  N(1)
-  N(2)
-  N(3)
-  N(4)
-  N(5)
-  N(6)
+  N(1 I($I8))
+  N(2 I($I7))
+  N(3 I($I6))
+  N(4 I($I5))
+  N(5 I($I4))
+  N(6 I($I2))
   P(1)
   P(2)
   P(3)
@@ -163,8 +163,8 @@ J(
   N(6 I('8')
    R(l12 (4410 1920) (0 0))
   )
-  N(7)
-  N(8)
+  N(7 I($I4))
+  N(8 I($I2))
   P(1 I('3'))
   P(2 I('5'))
   P(3 I('7'))
@@ -198,27 +198,27 @@ J(
    R(l3 (-1295 925) (1235 350))
    R(l11 (-910 -150) (0 0))
   )
-  N(2
+  N(2 I($2)
    R(l3 (445 805) (480 550))
    R(l7 (-435 -365) (220 220))
    R(l8 (-1065 -285) (1105 350))
   )
-  N(3
+  N(3 I($3)
    R(l3 (1345 925) (1945 350))
    R(l7 (-1885 -285) (220 220))
    R(l8 (-295 -370) (440 520))
   )
-  N(4
+  N(4 I($4)
    R(l3 (3745 805) (480 550))
    R(l7 (-435 -365) (220 220))
    R(l8 (-1065 -285) (1105 350))
   )
-  N(5
+  N(5 I($5)
    R(l3 (4645 925) (1945 350))
    R(l7 (-1885 -285) (220 220))
    R(l8 (-295 -370) (440 520))
   )
-  N(6
+  N(6 I($6)
    R(l3 (7045 805) (480 550))
    R(l7 (-435 -365) (220 220))
    R(l8 (-1065 -285) (1105 350))
diff --git a/testdata/lvs/layer_names.lvsdb b/testdata/lvs/layer_names.lvsdb
index 1a9df5bf6..b864403fa 100644
--- a/testdata/lvs/layer_names.lvsdb
+++ b/testdata/lvs/layer_names.lvsdb
@@ -216,7 +216,7 @@ layout(
   rect((-100 400) (5600 7600))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(metal1 (3100 2950) (950 300))
   )
   net(2 name(A)
@@ -226,8 +226,8 @@ layout(
    rect(metal1 (2400 3100) (0 0))
   )
   net(4 name(SUBSTRATE))
-  net(5)
-  net(6)
+  net(5 name($I3))
+  net(6 name($I1))
 
   # Outgoing pins and their connections to nets
   pin(2 name(A))
diff --git a/testdata/lvs/must_connect1.lvsdb b/testdata/lvs/must_connect1.lvsdb
index 26eeb011f..7126a9445 100644
--- a/testdata/lvs/must_connect1.lvsdb
+++ b/testdata/lvs/must_connect1.lvsdb
@@ -54,7 +54,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -63,7 +63,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -72,12 +72,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
@@ -160,14 +160,14 @@ J(
  )
  X(INVCHAIN
   R((-915 -15) (10415 9215))
-  N(1
+  N(1 I($1)
    R(l3 (7340 1650) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (1625 1835) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
@@ -225,21 +225,21 @@ J(
  )
  X(TOP
   R((-305 350) (15415 9225))
-  N(1
+  N(1 I($1)
    R(l3 (12950 2130) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (12100 7300) (640 530))
    R(l7 (-540 -415) (270 250))
    R(l8 (-1695 -250) (1695 250))
    R(l8 (-4075 -5650) (2630 250))
    R(l8 (-250 0) (250 5150))
   )
-  N(3
+  N(3 I($3)
    R(l7 (6465 7325) (220 240))
    R(l8 (-4100 -5365) (3125 250))
    R(l8 (-250 0) (250 4860))
diff --git a/testdata/lvs/must_connect1_tl.lvsdb b/testdata/lvs/must_connect1_tl.lvsdb
index fa6a8ab2c..06886d1ad 100644
--- a/testdata/lvs/must_connect1_tl.lvsdb
+++ b/testdata/lvs/must_connect1_tl.lvsdb
@@ -54,7 +54,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -63,7 +63,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -72,12 +72,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
@@ -160,14 +160,14 @@ J(
  )
  X(INVCHAIN
   R((-915 -15) (10415 9215))
-  N(1
+  N(1 I($1)
    R(l3 (7340 1650) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (1625 1835) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
@@ -225,21 +225,21 @@ J(
  )
  X(TOP
   R((-305 350) (15415 9225))
-  N(1
+  N(1 I($1)
    R(l3 (12950 2130) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (12100 7300) (640 530))
    R(l7 (-540 -415) (270 250))
    R(l8 (-1695 -250) (1695 250))
    R(l8 (-4075 -5650) (2630 250))
    R(l8 (-250 0) (250 5150))
   )
-  N(3
+  N(3 I($3)
    R(l7 (6465 7325) (220 240))
    R(l8 (-4100 -5365) (3125 250))
    R(l8 (-250 0) (250 4860))
diff --git a/testdata/lvs/must_connect2.lvsdb b/testdata/lvs/must_connect2.lvsdb
index 9357d2c35..f73599655 100644
--- a/testdata/lvs/must_connect2.lvsdb
+++ b/testdata/lvs/must_connect2.lvsdb
@@ -56,7 +56,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -65,7 +65,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -74,12 +74,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
@@ -162,14 +162,14 @@ J(
  )
  X(INVCHAIN
   R((-915 -15) (10415 9215))
-  N(1
+  N(1 I($1)
    R(l3 (7340 1650) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (1625 1835) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
@@ -228,21 +228,21 @@ J(
  )
  X(TOP
   R((-305 350) (15415 9225))
-  N(1
+  N(1 I($1)
    R(l3 (12950 2130) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (12100 7300) (640 530))
    R(l7 (-540 -415) (270 250))
    R(l8 (-1695 -250) (1695 250))
    R(l8 (-4075 -5650) (2630 250))
    R(l8 (-250 0) (250 5150))
   )
-  N(3
+  N(3 I($3)
    R(l7 (6465 7325) (220 240))
    R(l8 (-4100 -5365) (3125 250))
    R(l8 (-250 0) (250 4860))
diff --git a/testdata/lvs/must_connect3.lvsdb b/testdata/lvs/must_connect3.lvsdb
index 19782493b..003f4aa50 100644
--- a/testdata/lvs/must_connect3.lvsdb
+++ b/testdata/lvs/must_connect3.lvsdb
@@ -53,7 +53,7 @@ J(
  )
  X(INV
   R((-1500 -800) (3000 4600))
-  N(1
+  N(1 I($1)
    R(l6 (290 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -62,7 +62,7 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l5 (-1375 -925) (775 950))
   )
-  N(2
+  N(2 I($2)
    R(l6 (290 2490) (220 220))
    R(l6 (-220 180) (220 220))
    R(l8 (-290 -690) (360 760))
@@ -71,12 +71,12 @@ J(
    R(l10 (-2025 -775) (3000 900))
    R(l2 (-1375 -925) (775 950))
   )
-  N(3
+  N(3 I($3)
    R(l3 (-125 -250) (250 2500))
    R(l3 (-250 -3050) (250 1600))
    R(l3 (-250 1200) (250 1600))
   )
-  N(4
+  N(4 I($4)
    R(l6 (-510 -310) (220 220))
    R(l6 (-220 180) (220 220))
    R(l6 (-220 2180) (220 220))
@@ -159,14 +159,14 @@ J(
  )
  X(INVCHAIN
   R((-915 -15) (10415 9215))
-  N(1
+  N(1 I($1)
    R(l3 (7340 1650) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
    R(l7 (-1545 -250) (240 250))
    R(l8 (-560 -375) (690 510))
   )
-  N(2
+  N(2 I($2)
    R(l3 (1625 1835) (2160 250))
    R(l3 (-250 0) (250 4990))
    R(l3 (-1605 0) (1605 250))
@@ -225,13 +225,13 @@ J(
  )
  X(TOP
   R((-305 350) (15415 9225))
-  N(1
+  N(1 I($1)
    R(l10 (3200 4800) (8800 400))
    R(l10 (-5110 -425) (0 0))
    R(l10 (-4295 30) (0 0))
    R(l10 (9270 -80) (0 0))
   )
-  N(2
+  N(2 I($2)
    R(l10 (-305 4435) (250 1220))
    R(l10 (3665 -4655) (2780 400))
    R(l10 (-2780 6900) (2815 440))
diff --git a/testdata/lvs/nand2_split_gate.lvsdb.1 b/testdata/lvs/nand2_split_gate.lvsdb.1
index 0ade4db56..0016b563b 100644
--- a/testdata/lvs/nand2_split_gate.lvsdb.1
+++ b/testdata/lvs/nand2_split_gate.lvsdb.1
@@ -133,7 +133,7 @@ layout(
    rect(l11 (-300 -300) (400 400))
    text(l12 A (-200 -200))
   )
-  net(3
+  net(3 name($3)
    rect(l8 (1300 300) (200 200))
    rect(l8 (-200 -200) (200 200))
    rect(l8 (-200 300) (200 200))
diff --git a/testdata/lvs/nand2_split_gate.lvsdb.2 b/testdata/lvs/nand2_split_gate.lvsdb.2
index 0c99205ab..916c8a33c 100644
--- a/testdata/lvs/nand2_split_gate.lvsdb.2
+++ b/testdata/lvs/nand2_split_gate.lvsdb.2
@@ -133,7 +133,7 @@ layout(
    rect(l11 (-300 -300) (400 400))
    text(l12 A (-200 -200))
   )
-  net(3
+  net(3 name($3)
    rect(l8 (1300 300) (200 200))
    rect(l8 (-200 -200) (200 200))
    rect(l8 (-200 300) (200 200))
diff --git a/testdata/lvs/nand2_split_gate_early.lvsdb.1 b/testdata/lvs/nand2_split_gate_early.lvsdb.1
index 0ade4db56..0016b563b 100644
--- a/testdata/lvs/nand2_split_gate_early.lvsdb.1
+++ b/testdata/lvs/nand2_split_gate_early.lvsdb.1
@@ -133,7 +133,7 @@ layout(
    rect(l11 (-300 -300) (400 400))
    text(l12 A (-200 -200))
   )
-  net(3
+  net(3 name($3)
    rect(l8 (1300 300) (200 200))
    rect(l8 (-200 -200) (200 200))
    rect(l8 (-200 300) (200 200))
diff --git a/testdata/lvs/nand2_split_gate_early.lvsdb.2 b/testdata/lvs/nand2_split_gate_early.lvsdb.2
index 0c99205ab..916c8a33c 100644
--- a/testdata/lvs/nand2_split_gate_early.lvsdb.2
+++ b/testdata/lvs/nand2_split_gate_early.lvsdb.2
@@ -133,7 +133,7 @@ layout(
    rect(l11 (-300 -300) (400 400))
    text(l12 A (-200 -200))
   )
-  net(3
+  net(3 name($3)
    rect(l8 (1300 300) (200 200))
    rect(l8 (-200 -200) (200 200))
    rect(l8 (-200 300) (200 200))
diff --git a/testdata/lvs/res_combine1.lvsdb.1 b/testdata/lvs/res_combine1.lvsdb.1
index be2dcbb47..c90222ede 100644
--- a/testdata/lvs/res_combine1.lvsdb.1
+++ b/testdata/lvs/res_combine1.lvsdb.1
@@ -44,7 +44,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine1.lvsdb.2 b/testdata/lvs/res_combine1.lvsdb.2
index 725a958ca..51a640e6d 100644
--- a/testdata/lvs/res_combine1.lvsdb.2
+++ b/testdata/lvs/res_combine1.lvsdb.2
@@ -44,7 +44,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine1.lvsdb.3 b/testdata/lvs/res_combine1.lvsdb.3
index 594bea880..00967a2b9 100644
--- a/testdata/lvs/res_combine1.lvsdb.3
+++ b/testdata/lvs/res_combine1.lvsdb.3
@@ -44,7 +44,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine1.lvsdb.4 b/testdata/lvs/res_combine1.lvsdb.4
index f9b232132..fac3dc94d 100644
--- a/testdata/lvs/res_combine1.lvsdb.4
+++ b/testdata/lvs/res_combine1.lvsdb.4
@@ -44,7 +44,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine1.lvsdb.5 b/testdata/lvs/res_combine1.lvsdb.5
index d7a796e89..cbb05935b 100644
--- a/testdata/lvs/res_combine1.lvsdb.5
+++ b/testdata/lvs/res_combine1.lvsdb.5
@@ -44,7 +44,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine1.lvsdb.6 b/testdata/lvs/res_combine1.lvsdb.6
index 456048215..2298c03fd 100644
--- a/testdata/lvs/res_combine1.lvsdb.6
+++ b/testdata/lvs/res_combine1.lvsdb.6
@@ -44,7 +44,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine2.lvsdb.1 b/testdata/lvs/res_combine2.lvsdb.1
index 877dec9ae..3016b7509 100644
--- a/testdata/lvs/res_combine2.lvsdb.1
+++ b/testdata/lvs/res_combine2.lvsdb.1
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine2.lvsdb.2 b/testdata/lvs/res_combine2.lvsdb.2
index 8019fd0ca..0727eb8e8 100644
--- a/testdata/lvs/res_combine2.lvsdb.2
+++ b/testdata/lvs/res_combine2.lvsdb.2
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine2.lvsdb.3 b/testdata/lvs/res_combine2.lvsdb.3
index ce3c2a3de..373d67535 100644
--- a/testdata/lvs/res_combine2.lvsdb.3
+++ b/testdata/lvs/res_combine2.lvsdb.3
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine2.lvsdb.4 b/testdata/lvs/res_combine2.lvsdb.4
index ac3e9baa4..b53567902 100644
--- a/testdata/lvs/res_combine2.lvsdb.4
+++ b/testdata/lvs/res_combine2.lvsdb.4
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine2.lvsdb.5 b/testdata/lvs/res_combine2.lvsdb.5
index 6f538c7ef..e0ce48f65 100644
--- a/testdata/lvs/res_combine2.lvsdb.5
+++ b/testdata/lvs/res_combine2.lvsdb.5
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine2.lvsdb.6 b/testdata/lvs/res_combine2.lvsdb.6
index 0b94b61ee..035e6f33c 100644
--- a/testdata/lvs/res_combine2.lvsdb.6
+++ b/testdata/lvs/res_combine2.lvsdb.6
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine3.lvsdb.1 b/testdata/lvs/res_combine3.lvsdb.1
index d067edf33..aa98fc515 100644
--- a/testdata/lvs/res_combine3.lvsdb.1
+++ b/testdata/lvs/res_combine3.lvsdb.1
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine3.lvsdb.2 b/testdata/lvs/res_combine3.lvsdb.2
index 14254a034..f8d3d174e 100644
--- a/testdata/lvs/res_combine3.lvsdb.2
+++ b/testdata/lvs/res_combine3.lvsdb.2
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine3.lvsdb.3 b/testdata/lvs/res_combine3.lvsdb.3
index c4c6ed4e3..ce4f60f01 100644
--- a/testdata/lvs/res_combine3.lvsdb.3
+++ b/testdata/lvs/res_combine3.lvsdb.3
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine3.lvsdb.4 b/testdata/lvs/res_combine3.lvsdb.4
index c8ae0cd34..f04346bc2 100644
--- a/testdata/lvs/res_combine3.lvsdb.4
+++ b/testdata/lvs/res_combine3.lvsdb.4
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine3.lvsdb.5 b/testdata/lvs/res_combine3.lvsdb.5
index 073211088..319e0c750 100644
--- a/testdata/lvs/res_combine3.lvsdb.5
+++ b/testdata/lvs/res_combine3.lvsdb.5
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/res_combine3.lvsdb.6 b/testdata/lvs/res_combine3.lvsdb.6
index abb6d99e0..c77f35c23 100644
--- a/testdata/lvs/res_combine3.lvsdb.6
+++ b/testdata/lvs/res_combine3.lvsdb.6
@@ -40,7 +40,7 @@ layout(
   rect((8285 720) (117975 57350))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l4 (120580 32490) (220 220))
    rect(l4 (-220 -745) (220 220))
    rect(l4 (-220 -745) (220 220))
diff --git a/testdata/lvs/ringo_device_subcircuits.lvsdb.1 b/testdata/lvs/ringo_device_subcircuits.lvsdb.1
index a53138333..b3e9d8cf3 100644
--- a/testdata/lvs/ringo_device_subcircuits.lvsdb.1
+++ b/testdata/lvs/ringo_device_subcircuits.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_device_subcircuits.lvsdb.2 b/testdata/lvs/ringo_device_subcircuits.lvsdb.2
index c74e25058..d01baf5b0 100644
--- a/testdata/lvs/ringo_device_subcircuits.lvsdb.2
+++ b/testdata/lvs/ringo_device_subcircuits.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_layout_var.lvsdb.1 b/testdata/lvs/ringo_layout_var.lvsdb.1
index 276675045..09a84c082 100644
--- a/testdata/lvs/ringo_layout_var.lvsdb.1
+++ b/testdata/lvs/ringo_layout_var.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -390,7 +390,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -448,34 +448,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_layout_var.lvsdb.2 b/testdata/lvs/ringo_layout_var.lvsdb.2
index 2238cd24b..fb9e4a5a0 100644
--- a/testdata/lvs/ringo_layout_var.lvsdb.2
+++ b/testdata/lvs/ringo_layout_var.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -390,7 +390,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -448,34 +448,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_mixed_hierarchy.lvsdb b/testdata/lvs/ringo_mixed_hierarchy.lvsdb
index 7824c9d2c..aaa1a946e 100644
--- a/testdata/lvs/ringo_mixed_hierarchy.lvsdb
+++ b/testdata/lvs/ringo_mixed_hierarchy.lvsdb
@@ -166,7 +166,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -288,7 +288,7 @@ layout(
    rect(l9 (-2275 -450) (500 1500))
    rect(l9 (22900 -1500) (500 1500))
   )
-  net(4
+  net(4 name($4)
    rect(l8 (3610 1770) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-1580 3760) (180 180))
diff --git a/testdata/lvs/ringo_simple.lvsdb.1 b/testdata/lvs/ringo_simple.lvsdb.1
index 30cbf6980..c7c49dbe7 100644
--- a/testdata/lvs/ringo_simple.lvsdb.1
+++ b/testdata/lvs/ringo_simple.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple.lvsdb.2 b/testdata/lvs/ringo_simple.lvsdb.2
index 94c1f9904..ef872de19 100644
--- a/testdata/lvs/ringo_simple.lvsdb.2
+++ b/testdata/lvs/ringo_simple.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_blackboxing.lvsdb b/testdata/lvs/ringo_simple_blackboxing.lvsdb
index a76727f22..d572caf85 100644
--- a/testdata/lvs/ringo_simple_blackboxing.lvsdb
+++ b/testdata/lvs/ringo_simple_blackboxing.lvsdb
@@ -92,16 +92,16 @@ layout(
   rect((600 250) (25800 7750))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (18150 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (19950 2950) (900 300))
   )
   net(5 name(FB)
diff --git a/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb b/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb
index a76727f22..d572caf85 100644
--- a/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb
+++ b/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb
@@ -92,16 +92,16 @@ layout(
   rect((600 250) (25800 7750))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (18150 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (19950 2950) (900 300))
   )
   net(5 name(FB)
diff --git a/testdata/lvs/ringo_simple_compare2.lvsdb.1 b/testdata/lvs/ringo_simple_compare2.lvsdb.1
index 30cbf6980..c7c49dbe7 100644
--- a/testdata/lvs/ringo_simple_compare2.lvsdb.1
+++ b/testdata/lvs/ringo_simple_compare2.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_compare2.lvsdb.2 b/testdata/lvs/ringo_simple_compare2.lvsdb.2
index 94c1f9904..ef872de19 100644
--- a/testdata/lvs/ringo_simple_compare2.lvsdb.2
+++ b/testdata/lvs/ringo_simple_compare2.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
index 3c8750631..7741c19d1 100644
--- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
+++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
index 6c89b4e06..9c45bc1f1 100644
--- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
+++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_dmos.lvsdb.1 b/testdata/lvs/ringo_simple_dmos.lvsdb.1
index 155a4128c..a32be3a4b 100644
--- a/testdata/lvs/ringo_simple_dmos.lvsdb.1
+++ b/testdata/lvs/ringo_simple_dmos.lvsdb.1
@@ -179,11 +179,11 @@ layout(
    rect(l13 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l8 (975 1660) (425 950))
    rect(l8 (-400 -950) (425 950))
   )
-  net(5
+  net(5 name($5)
    rect(l4 (-100 4500) (2600 3500))
   )
   net(6 name(B)
@@ -307,7 +307,7 @@ layout(
    rect(l13 (-850 -400) (0 0))
    rect(l8 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l4 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -365,34 +365,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l13 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l13 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l13 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l13 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l13 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l13 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l13 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l13 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l13 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l13 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_dmos.lvsdb.2 b/testdata/lvs/ringo_simple_dmos.lvsdb.2
index 64a000533..bce38cb9d 100644
--- a/testdata/lvs/ringo_simple_dmos.lvsdb.2
+++ b/testdata/lvs/ringo_simple_dmos.lvsdb.2
@@ -179,11 +179,11 @@ layout(
    rect(l13 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l8 (1000 1660) (425 950))
    rect(l8 (-450 -950) (425 950))
   )
-  net(5
+  net(5 name($5)
    rect(l4 (-100 4500) (2600 3500))
   )
   net(6 name(B)
@@ -307,7 +307,7 @@ layout(
    rect(l13 (-850 -400) (0 0))
    rect(l8 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l4 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -365,34 +365,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l13 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l13 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l13 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l13 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l13 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l13 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l13 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l13 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l13 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l13 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1 b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1
index f5a1b048e..8ef823a92 100644
--- a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1
+++ b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1
@@ -181,13 +181,13 @@ layout(
    rect(l8 (-950 860) (208 950))
    rect(l8 (0 -950) (217 950))
   )
-  net(4
+  net(4 name($4)
    rect(l8 (1208 1660) (192 950))
    rect(l8 (-192 -950) (217 950))
    rect(l6 (-425 -950) (208 950))
    rect(l6 (-233 -950) (233 950))
   )
-  net(5
+  net(5 name($5)
    rect(l4 (-100 4500) (2600 3500))
   )
   net(6 name(B)
@@ -313,7 +313,7 @@ layout(
    rect(l8 (-650 860) (208 950))
    rect(l8 (0 -950) (217 950))
   )
-  net(4
+  net(4 name($4)
    rect(l4 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -371,34 +371,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l13 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l13 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l13 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l13 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l13 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l13 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l13 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l13 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l13 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l13 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2 b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2
index 65550776c..e8b7f3655 100644
--- a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2
+++ b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2
@@ -181,13 +181,13 @@ layout(
    rect(l8 (-950 860) (208 950))
    rect(l8 (0 -950) (217 950))
   )
-  net(4
+  net(4 name($4)
    rect(l8 (1208 1660) (192 950))
    rect(l8 (-192 -950) (217 950))
    rect(l6 (-425 -950) (208 950))
    rect(l6 (-233 -950) (233 950))
   )
-  net(5
+  net(5 name($5)
    rect(l4 (-100 4500) (2600 3500))
   )
   net(6 name(B)
@@ -313,7 +313,7 @@ layout(
    rect(l8 (-650 860) (208 950))
    rect(l8 (0 -950) (217 950))
   )
-  net(4
+  net(4 name($4)
    rect(l4 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -371,34 +371,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l13 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l13 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l13 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l13 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l13 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l13 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l13 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l13 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l13 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l13 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_dummy_device.lvsdb.1 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.1
index 10f93fc33..34f8ebd41 100644
--- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.1
+++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
diff --git a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
index 4abffb39a..dbecf1b84 100644
--- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
+++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
index 74a756054..cd3ac06ea 100644
--- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
+++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
@@ -178,7 +178,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -306,7 +306,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -364,34 +364,34 @@ layout(
   rect((0 350) (28300 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (1160 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (6050 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7850 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9650 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (11450 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (13250 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (15050 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16850 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18650 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (20450 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
index 0657be4d3..dcfb4d716 100644
--- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
+++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
@@ -178,7 +178,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -306,7 +306,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -364,34 +364,34 @@ layout(
   rect((0 350) (28300 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (1160 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (6050 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7850 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9650 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (11450 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (13250 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (15050 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16850 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18650 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (20450 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_io.lvsdb.1 b/testdata/lvs/ringo_simple_io.lvsdb.1
index 9b2db59ba..584f02e4e 100644
--- a/testdata/lvs/ringo_simple_io.lvsdb.1
+++ b/testdata/lvs/ringo_simple_io.lvsdb.1
@@ -152,7 +152,7 @@ J(
    R(l11 (-1150 -400) (0 0))
    R(l6 (-950 860) (425 950))
   )
-  N(4
+  N(4 I($4)
    R(l3 (-100 4500) (2600 3500))
   )
   N(5 I(B)
@@ -271,7 +271,7 @@ J(
    R(l11 (-850 -400) (0 0))
    R(l6 (-650 860) (425 950))
   )
-  N(4
+  N(4 I($4)
    R(l3 (-100 4500) (2000 3500))
   )
   N(5 I(IN)
@@ -320,34 +320,34 @@ J(
  )
  X(RINGO
   R((0 350) (25800 7650))
-  N(1
+  N(1 I($1)
    R(l11 (4040 2950) (610 300))
   )
-  N(2
+  N(2 I($2)
    R(l11 (5550 2950) (900 300))
   )
-  N(3
+  N(3 I($3)
    R(l11 (7350 2950) (900 300))
   )
-  N(4
+  N(4 I($4)
    R(l11 (9150 2950) (900 300))
   )
-  N(5
+  N(5 I($5)
    R(l11 (10950 2950) (900 300))
   )
-  N(6
+  N(6 I($6)
    R(l11 (12750 2950) (900 300))
   )
-  N(7
+  N(7 I($7)
    R(l11 (14550 2950) (900 300))
   )
-  N(8
+  N(8 I($8)
    R(l11 (16350 2950) (900 300))
   )
-  N(9
+  N(9 I($9)
    R(l11 (18150 2950) (900 300))
   )
-  N(10
+  N(10 I($10)
    R(l11 (19950 2950) (900 300))
   )
   N(11 I(FB)
diff --git a/testdata/lvs/ringo_simple_io.lvsdb.2 b/testdata/lvs/ringo_simple_io.lvsdb.2
index 3dd69d78c..d4ce3d5dc 100644
--- a/testdata/lvs/ringo_simple_io.lvsdb.2
+++ b/testdata/lvs/ringo_simple_io.lvsdb.2
@@ -152,7 +152,7 @@ J(
    R(l11 (-1150 -400) (0 0))
    R(l6 (-950 860) (425 950))
   )
-  N(4
+  N(4 I($4)
    R(l3 (-100 4500) (2600 3500))
   )
   N(5 I(B)
@@ -271,7 +271,7 @@ J(
    R(l11 (-850 -400) (0 0))
    R(l6 (-650 860) (425 950))
   )
-  N(4
+  N(4 I($4)
    R(l3 (-100 4500) (2000 3500))
   )
   N(5 I(IN)
@@ -320,34 +320,34 @@ J(
  )
  X(RINGO
   R((0 350) (25800 7650))
-  N(1
+  N(1 I($1)
    R(l11 (4040 2950) (610 300))
   )
-  N(2
+  N(2 I($2)
    R(l11 (5550 2950) (900 300))
   )
-  N(3
+  N(3 I($3)
    R(l11 (7350 2950) (900 300))
   )
-  N(4
+  N(4 I($4)
    R(l11 (9150 2950) (900 300))
   )
-  N(5
+  N(5 I($5)
    R(l11 (10950 2950) (900 300))
   )
-  N(6
+  N(6 I($6)
    R(l11 (12750 2950) (900 300))
   )
-  N(7
+  N(7 I($7)
    R(l11 (14550 2950) (900 300))
   )
-  N(8
+  N(8 I($8)
    R(l11 (16350 2950) (900 300))
   )
-  N(9
+  N(9 I($9)
    R(l11 (18150 2950) (900 300))
   )
-  N(10
+  N(10 I($10)
    R(l11 (19950 2950) (900 300))
   )
   N(11 I(FB)
diff --git a/testdata/lvs/ringo_simple_io2.l2n.1 b/testdata/lvs/ringo_simple_io2.l2n.1
index ef8092802..d766d4aec 100644
--- a/testdata/lvs/ringo_simple_io2.l2n.1
+++ b/testdata/lvs/ringo_simple_io2.l2n.1
@@ -151,7 +151,7 @@ X(ND2X1
   R(l11 (-1150 -400) (0 0))
   R(l6 (-950 860) (425 950))
  )
- N(4
+ N(4 I($4)
   R(l3 (-100 4500) (2600 3500))
  )
  N(5 I(B)
@@ -270,7 +270,7 @@ X(INVX1
   R(l11 (-850 -400) (0 0))
   R(l6 (-650 860) (425 950))
  )
- N(4
+ N(4 I($4)
   R(l3 (-100 4500) (2000 3500))
  )
  N(5 I(IN)
@@ -319,34 +319,34 @@ X(INVX1
 )
 X(RINGO
  R((0 350) (25800 7650))
- N(1
+ N(1 I($1)
   R(l11 (4040 2950) (610 300))
  )
- N(2
+ N(2 I($2)
   R(l11 (5550 2950) (900 300))
  )
- N(3
+ N(3 I($3)
   R(l11 (7350 2950) (900 300))
  )
- N(4
+ N(4 I($4)
   R(l11 (9150 2950) (900 300))
  )
- N(5
+ N(5 I($5)
   R(l11 (10950 2950) (900 300))
  )
- N(6
+ N(6 I($6)
   R(l11 (12750 2950) (900 300))
  )
- N(7
+ N(7 I($7)
   R(l11 (14550 2950) (900 300))
  )
- N(8
+ N(8 I($8)
   R(l11 (16350 2950) (900 300))
  )
- N(9
+ N(9 I($9)
   R(l11 (18150 2950) (900 300))
  )
- N(10
+ N(10 I($10)
   R(l11 (19950 2950) (900 300))
  )
  N(11 I(FB)
diff --git a/testdata/lvs/ringo_simple_io2.l2n.2 b/testdata/lvs/ringo_simple_io2.l2n.2
index 871a19bb3..3fe66dec6 100644
--- a/testdata/lvs/ringo_simple_io2.l2n.2
+++ b/testdata/lvs/ringo_simple_io2.l2n.2
@@ -151,7 +151,7 @@ X(ND2X1
   R(l11 (-1150 -400) (0 0))
   R(l6 (-950 860) (425 950))
  )
- N(4
+ N(4 I($4)
   R(l3 (-100 4500) (2600 3500))
  )
  N(5 I(B)
@@ -270,7 +270,7 @@ X(INVX1
   R(l11 (-850 -400) (0 0))
   R(l6 (-650 860) (425 950))
  )
- N(4
+ N(4 I($4)
   R(l3 (-100 4500) (2000 3500))
  )
  N(5 I(IN)
@@ -319,34 +319,34 @@ X(INVX1
 )
 X(RINGO
  R((0 350) (25800 7650))
- N(1
+ N(1 I($1)
   R(l11 (4040 2950) (610 300))
  )
- N(2
+ N(2 I($2)
   R(l11 (5550 2950) (900 300))
  )
- N(3
+ N(3 I($3)
   R(l11 (7350 2950) (900 300))
  )
- N(4
+ N(4 I($4)
   R(l11 (9150 2950) (900 300))
  )
- N(5
+ N(5 I($5)
   R(l11 (10950 2950) (900 300))
  )
- N(6
+ N(6 I($6)
   R(l11 (12750 2950) (900 300))
  )
- N(7
+ N(7 I($7)
   R(l11 (14550 2950) (900 300))
  )
- N(8
+ N(8 I($8)
   R(l11 (16350 2950) (900 300))
  )
- N(9
+ N(9 I($9)
   R(l11 (18150 2950) (900 300))
  )
- N(10
+ N(10 I($10)
   R(l11 (19950 2950) (900 300))
  )
  N(11 I(FB)
diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.1 b/testdata/lvs/ringo_simple_io2.lvsdb.1
index 30cbf6980..c7c49dbe7 100644
--- a/testdata/lvs/ringo_simple_io2.lvsdb.1
+++ b/testdata/lvs/ringo_simple_io2.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.2 b/testdata/lvs/ringo_simple_io2.lvsdb.2
index 94c1f9904..ef872de19 100644
--- a/testdata/lvs/ringo_simple_io2.lvsdb.2
+++ b/testdata/lvs/ringo_simple_io2.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1 b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
index 835c6f61c..82d084acd 100644
--- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
+++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2 b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
index 6e73c3fdf..2f1d004f9 100644
--- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
+++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1 b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
index 9a08296ca..540484692 100644
--- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
+++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2 b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
index dbeab1f69..99f73ad33 100644
--- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
+++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
index 95ce47712..0b35a65e1 100644
--- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
+++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
@@ -177,7 +177,7 @@ layout(
    rect(l17 (-1150 -400) (0 0))
    rect(l9 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -305,7 +305,7 @@ layout(
    rect(l17 (-850 -400) (0 0))
    rect(l9 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -363,34 +363,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l17 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l17 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l17 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l17 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l17 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l17 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l17 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l17 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l17 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l17 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
index 08ae6e339..01a5f5ee4 100644
--- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
+++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
@@ -177,7 +177,7 @@ layout(
    rect(l17 (-1150 -400) (0 0))
    rect(l9 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -305,7 +305,7 @@ layout(
    rect(l17 (-850 -400) (0 0))
    rect(l9 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -363,34 +363,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l17 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l17 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l17 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l17 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l17 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l17 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l17 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l17 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l17 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l17 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.1 b/testdata/lvs/ringo_simple_simplification.lvsdb.1
index fc1c945d2..673eeb9e6 100644
--- a/testdata/lvs/ringo_simple_simplification.lvsdb.1
+++ b/testdata/lvs/ringo_simple_simplification.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -417,7 +417,7 @@ layout(
    rect(l6 (-650 860) (425 950))
    rect(l6 (950 -950) (425 950))
   )
-  net(5
+  net(5 name($5)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(6 name(SUBSTRATE))
@@ -483,16 +483,16 @@ layout(
   rect((600 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (18150 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (19950 2950) (900 300))
   )
   net(5 name(FB)
diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.2 b/testdata/lvs/ringo_simple_simplification.lvsdb.2
index 494dbfa62..86f2734bf 100644
--- a/testdata/lvs/ringo_simple_simplification.lvsdb.2
+++ b/testdata/lvs/ringo_simple_simplification.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -417,7 +417,7 @@ layout(
    rect(l6 (725 860) (425 950))
    rect(l6 (-1800 -950) (425 950))
   )
-  net(5
+  net(5 name($5)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(6 name(SUBSTRATE))
@@ -483,16 +483,16 @@ layout(
   rect((600 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (18150 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (19950 2950) (900 300))
   )
   net(5 name(FB)
diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
index 2d9fdbac8..e92e8e9a5 100644
--- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
+++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -417,7 +417,7 @@ layout(
    rect(l6 (-650 860) (425 950))
    rect(l6 (950 -950) (425 950))
   )
-  net(5
+  net(5 name($5)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(6 name(SUBSTRATE))
@@ -483,16 +483,16 @@ layout(
   rect((600 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (18150 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (19950 2950) (900 300))
   )
   net(5 name(FB)
diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
index e374d9100..a0eab7f51 100644
--- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
+++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -417,7 +417,7 @@ layout(
    rect(l6 (725 860) (425 950))
    rect(l6 (-1800 -950) (425 950))
   )
-  net(5
+  net(5 name($5)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(6 name(SUBSTRATE))
@@ -483,16 +483,16 @@ layout(
   rect((600 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (18150 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (19950 2950) (900 300))
   )
   net(5 name(FB)
diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol.lvsdb.1
index 98d8bdee9..ce2a291d8 100644
--- a/testdata/lvs/ringo_simple_with_tol.lvsdb.1
+++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol.lvsdb.2
index 1ea753c38..03805ce69 100644
--- a/testdata/lvs/ringo_simple_with_tol.lvsdb.2
+++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1
index 98d8bdee9..ce2a291d8 100644
--- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1
+++ b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
index 1ea753c38..03805ce69 100644
--- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
+++ b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
@@ -175,7 +175,7 @@ layout(
    rect(l11 (-1150 -400) (0 0))
    rect(l6 (-950 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2600 3500))
   )
   net(5 name(B)
@@ -303,7 +303,7 @@ layout(
    rect(l11 (-850 -400) (0 0))
    rect(l6 (-650 860) (425 950))
   )
-  net(4
+  net(4 name($4)
    rect(l3 (-100 4500) (2000 3500))
   )
   net(5 name(IN)
@@ -361,34 +361,34 @@ layout(
   rect((0 350) (25800 7650))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l11 (4040 2950) (610 300))
   )
-  net(2
+  net(2 name($2)
    rect(l11 (5550 2950) (900 300))
   )
-  net(3
+  net(3 name($3)
    rect(l11 (7350 2950) (900 300))
   )
-  net(4
+  net(4 name($4)
    rect(l11 (9150 2950) (900 300))
   )
-  net(5
+  net(5 name($5)
    rect(l11 (10950 2950) (900 300))
   )
-  net(6
+  net(6 name($6)
    rect(l11 (12750 2950) (900 300))
   )
-  net(7
+  net(7 name($7)
    rect(l11 (14550 2950) (900 300))
   )
-  net(8
+  net(8 name($8)
    rect(l11 (16350 2950) (900 300))
   )
-  net(9
+  net(9 name($9)
    rect(l11 (18150 2950) (900 300))
   )
-  net(10
+  net(10 name($10)
    rect(l11 (19950 2950) (900 300))
   )
   net(11 name(FB)
diff --git a/testdata/lvs/soft_connect1.l2n b/testdata/lvs/soft_connect1.l2n
index 2e2c95ba8..364e0248a 100644
--- a/testdata/lvs/soft_connect1.l2n
+++ b/testdata/lvs/soft_connect1.l2n
@@ -75,7 +75,7 @@ D(D$NMOS NMOS
 )
 X(INV
  R((-1500 -800) (3000 4600))
- N(1
+ N(1 I($1)
   R(l8 (290 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -84,7 +84,7 @@ X(INV
   R(l14 (-2025 -775) (3000 900))
   R(l6 (-1375 -925) (775 950))
  )
- N(2
+ N(2 I($2)
   R(l8 (290 2490) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -93,15 +93,15 @@ X(INV
   R(l14 (-2025 -775) (3000 900))
   R(l2 (-1375 -925) (775 950))
  )
- N(3
+ N(3 I($3)
   R(l3 (-1500 1800) (3000 2000))
  )
- N(4
+ N(4 I($4)
   R(l4 (-125 -250) (250 2500))
   R(l4 (-250 -3050) (250 1600))
   R(l4 (-250 1200) (250 1600))
  )
- N(5
+ N(5 I($5)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l8 (-220 2180) (220 220))
@@ -148,7 +148,7 @@ X(INV
 )
 X(TOP
  R((600 800) (8880 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (2880 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-300 -300) (690 400))
diff --git a/testdata/lvs/soft_connect1a.l2n b/testdata/lvs/soft_connect1a.l2n
index c65a7d112..9e486321c 100644
--- a/testdata/lvs/soft_connect1a.l2n
+++ b/testdata/lvs/soft_connect1a.l2n
@@ -76,7 +76,7 @@ D(D$NMOS NMOS
 )
 X(INV
  R((-1500 -800) (3000 4600))
- N(1
+ N(1 I($1)
   R(l8 (290 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -85,7 +85,7 @@ X(INV
   R(l14 (-2025 -775) (3000 900))
   R(l6 (-1375 -925) (775 950))
  )
- N(2
+ N(2 I($2)
   R(l8 (290 2490) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -94,15 +94,15 @@ X(INV
   R(l14 (-2025 -775) (3000 900))
   R(l2 (-1375 -925) (775 950))
  )
- N(3
+ N(3 I($3)
   R(l3 (-1500 1800) (3000 2000))
  )
- N(4
+ N(4 I($4)
   R(l4 (-125 -250) (250 2500))
   R(l4 (-250 -3050) (250 1600))
   R(l4 (-250 1200) (250 1600))
  )
- N(5
+ N(5 I($5)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l8 (-220 2180) (220 220))
@@ -149,7 +149,7 @@ X(INV
 )
 X(TOP
  R((600 800) (8880 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (2880 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-300 -300) (690 400))
diff --git a/testdata/lvs/soft_connect2.l2n b/testdata/lvs/soft_connect2.l2n
index d75ed206d..2e8d13389 100644
--- a/testdata/lvs/soft_connect2.l2n
+++ b/testdata/lvs/soft_connect2.l2n
@@ -69,7 +69,7 @@ D(D$NMOS NMOS
 )
 X(INV
  R((-1500 -800) (3000 4600))
- N(1
+ N(1 I($1)
   R(l8 (290 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -78,7 +78,7 @@ X(INV
   R(l14 (-2025 -775) (3000 900))
   R(l6 (-1375 -925) (775 950))
  )
- N(2
+ N(2 I($2)
   R(l8 (290 2490) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -87,15 +87,15 @@ X(INV
   R(l14 (-2025 -775) (3000 900))
   R(l2 (-1375 -925) (775 950))
  )
- N(3
+ N(3 I($3)
   R(l3 (-1500 1800) (3000 2000))
  )
- N(4
+ N(4 I($4)
   R(l4 (-125 -250) (250 2500))
   R(l4 (-250 -3050) (250 1600))
   R(l4 (-250 1200) (250 1600))
  )
- N(5
+ N(5 I($5)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l8 (-220 2180) (220 220))
@@ -142,7 +142,7 @@ X(INV
 )
 X(TOP
  R((600 800) (8880 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (2880 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-300 -300) (690 400))
diff --git a/testdata/lvs/soft_connect3.l2n b/testdata/lvs/soft_connect3.l2n
index ff7a71bcc..fa0b6f009 100644
--- a/testdata/lvs/soft_connect3.l2n
+++ b/testdata/lvs/soft_connect3.l2n
@@ -75,7 +75,7 @@ D(D$NMOS NMOS
 )
 X(NTRANS
  R((-1000 -800) (2000 1600))
- N(1
+ N(1 I($1)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -111,7 +111,7 @@ X(NTRANS
 )
 X(PTRANS
  R((-1000 -800) (2000 1600))
- N(1
+ N(1 I($1)
   R(l8 (-510 -310) (220 220))
   R(l8 (-220 180) (220 220))
   R(l12 (-290 -690) (360 760))
@@ -126,7 +126,7 @@ X(PTRANS
  N(3 I($5)
   R(l4 (-125 -800) (250 1600))
  )
- N(4)
+ N(4 I($I3))
  P(1)
  P(2)
  P(3)
@@ -147,23 +147,23 @@ X(PTRANS
 )
 X(INV
  R((-1500 -800) (3000 4600))
- N(1
+ N(1 I($1)
   R(l13 (275 -325) (250 250))
   R(l13 (-250 150) (250 250))
   R(l14 (-2025 -775) (3000 900))
  )
- N(2
+ N(2 I($2)
   R(l13 (275 2475) (250 250))
   R(l13 (-250 150) (250 250))
   R(l14 (-2025 -775) (3000 900))
  )
- N(3
+ N(3 I($3)
   R(l3 (-1500 1800) (3000 2000))
  )
- N(4
+ N(4 I($4)
   R(l4 (-125 -250) (250 2500))
  )
- N(5
+ N(5 I($5)
   R(l12 (-580 -420) (360 2840))
  )
  N(6 I(SUBSTRATE))
@@ -188,7 +188,7 @@ X(INV
 )
 X(TOP
  R((600 800) (8880 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (2880 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-300 -300) (690 400))
diff --git a/testdata/lvs/soft_connect4.l2n b/testdata/lvs/soft_connect4.l2n
index 5cc59c0c3..2e123173b 100644
--- a/testdata/lvs/soft_connect4.l2n
+++ b/testdata/lvs/soft_connect4.l2n
@@ -90,7 +90,7 @@ X(INV
   R(l14 (-200 -900) (1000 900))
   R(l6 (-2175 -925) (775 950))
  )
- N(2
+ N(2 I($2)
   R(l3 (-1500 1800) (3000 2000))
   R(l3 (-200 -2000) (1000 2000))
   R(l8 (-2010 -1310) (220 220))
@@ -157,7 +157,7 @@ X(INV
 )
 X(TOP
  R((1500 800) (9080 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (3980 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-300 -300) (690 400))
diff --git a/testdata/lvs/soft_connect5.l2n b/testdata/lvs/soft_connect5.l2n
index bbe544f80..4a5d4bd14 100644
--- a/testdata/lvs/soft_connect5.l2n
+++ b/testdata/lvs/soft_connect5.l2n
@@ -90,7 +90,7 @@ X(INV
   R(l14 (-200 -900) (1000 900))
   R(l6 (-2175 -925) (775 950))
  )
- N(2
+ N(2 I($2)
   R(l3 (-1500 1800) (3000 2000))
   R(l3 (-200 -2000) (1000 2000))
   R(l8 (-2010 -1310) (220 220))
@@ -157,7 +157,7 @@ X(INV
 )
 X(TOP
  R((1500 800) (9080 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (3980 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-300 -300) (690 400))
diff --git a/testdata/lvs/soft_connect6.l2n b/testdata/lvs/soft_connect6.l2n
index 0d3e3a9ad..157ffc74c 100644
--- a/testdata/lvs/soft_connect6.l2n
+++ b/testdata/lvs/soft_connect6.l2n
@@ -75,7 +75,7 @@ D(D$NMOS NMOS
 )
 X(INV
  R((-1500 -800) (3800 4600))
- N(1
+ N(1 I($1)
   R(l8 (-1090 2490) (220 220))
   R(l8 (-220 180) (220 220))
   R(l8 (360 -3420) (220 220))
@@ -160,7 +160,7 @@ X(INV
 )
 X(TOP
  R((1500 800) (9080 4600))
- N(1
+ N(1 I($1)
   R(l4 (2920 2600) (3980 400))
   R(l11 (-300 -300) (200 200))
   R(l12 (-260 -300) (360 1600))
diff --git a/testdata/lvs/stray_texts1.l2n b/testdata/lvs/stray_texts1.l2n
index 312542798..526057696 100644
--- a/testdata/lvs/stray_texts1.l2n
+++ b/testdata/lvs/stray_texts1.l2n
@@ -49,10 +49,10 @@ X(MIDDLE
  N(2 I(F)
   J(l1 F (3000 510))
  )
- N(3)
- N(4)
- N(5)
- N(6)
+ N(3 I($I4))
+ N(4 I($I3))
+ N(5 I($I2))
+ N(6 I($I1))
  P(1 I(B))
  P(3)
  P(4)
@@ -69,12 +69,12 @@ X(MIDDLE
 )
 X(TOP
  R((-1280 -190) (4350 840))
- N(1
+ N(1 I($1)
   R(l3 (-680 -160) (170 760))
   R(l3 (-170 -790) (860 270))
   R(l3 (-200 -270) (220 780))
  )
- N(2
+ N(2 I($2)
   R(l3 (530 -180) (220 790))
   R(l3 (-220 -790) (790 180))
   R(l3 (-260 -180) (260 810))
@@ -82,10 +82,10 @@ X(TOP
  N(3 I(E)
   J(l1 E (2400 460))
  )
- N(4
+ N(4 I($4)
   R(l3 (-1280 -150) (210 750))
  )
- N(5
+ N(5 I($5)
   R(l3 (1660 -190) (240 840))
  )
  X(1 MIDDLE Y(-30 -40)
diff --git a/testdata/lvs/stray_texts2.l2n b/testdata/lvs/stray_texts2.l2n
index 92dd849ea..77a1bb3b4 100644
--- a/testdata/lvs/stray_texts2.l2n
+++ b/testdata/lvs/stray_texts2.l2n
@@ -47,10 +47,10 @@ X(MIDDLE
  N(2 I(F)
   R(l1 (3000 510) (0 0))
  )
- N(3)
- N(4)
- N(5)
- N(6)
+ N(3 I($I4))
+ N(4 I($I3))
+ N(5 I($I2))
+ N(6 I($I1))
  P(1 I(B))
  P(3)
  P(4)
@@ -67,12 +67,12 @@ X(MIDDLE
 )
 X(TOP
  R((-1280 -190) (4350 840))
- N(1
+ N(1 I($1)
   R(l2 (-680 -160) (170 760))
   R(l2 (-170 -790) (860 270))
   R(l2 (-200 -270) (220 780))
  )
- N(2
+ N(2 I($2)
   R(l2 (530 -180) (220 790))
   R(l2 (-220 -790) (790 180))
   R(l2 (-260 -180) (260 810))
@@ -80,10 +80,10 @@ X(TOP
  N(3 I(E)
   R(l1 (2400 460) (0 0))
  )
- N(4
+ N(4 I($4)
   R(l2 (-1280 -150) (210 750))
  )
- N(5
+ N(5 I($5)
   R(l2 (1660 -190) (240 840))
  )
  X(1 MIDDLE Y(-30 -40)
diff --git a/testdata/lvs/test_22a.lvsdb.1 b/testdata/lvs/test_22a.lvsdb.1
index 6f083ffa0..6ae452175 100644
--- a/testdata/lvs/test_22a.lvsdb.1
+++ b/testdata/lvs/test_22a.lvsdb.1
@@ -655,12 +655,12 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l23 (-170 -170) (170 170))
   )
-  net(10
+  net(10 name($10)
    rect(l7 (290 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(11
+  net(11 name($11)
    polygon(l2 (1365 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -671,7 +671,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(12
+  net(12 name($12)
    rect(l2 (290 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -682,17 +682,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(13
+  net(13 name($13)
    rect(l7 (940 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(14
+  net(14 name($14)
    rect(l7 (2470 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(15
+  net(15 name($15)
    polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -703,7 +703,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(16
+  net(16 name($16)
    rect(l2 (2470 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -714,17 +714,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(17
+  net(17 name($17)
    rect(l7 (3120 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(18
+  net(18 name($18)
    rect(l7 (4650 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(19
+  net(19 name($19)
    polygon(l2 (5725 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -735,7 +735,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(20
+  net(20 name($20)
    polygon(l2 (4650 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -746,17 +746,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(21
+  net(21 name($21)
    rect(l7 (5300 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(22
+  net(22 name($22)
    rect(l7 (6830 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(23
+  net(23 name($23)
    rect(l2 (7985 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -767,7 +767,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(24
+  net(24 name($24)
    rect(l2 (6830 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -778,7 +778,7 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(25
+  net(25 name($25)
    rect(l7 (7480 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
diff --git a/testdata/lvs/test_22a.lvsdb.2 b/testdata/lvs/test_22a.lvsdb.2
index b6914388f..643fa0a8a 100644
--- a/testdata/lvs/test_22a.lvsdb.2
+++ b/testdata/lvs/test_22a.lvsdb.2
@@ -655,7 +655,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l23 (-170 -170) (170 170))
   )
-  net(10
+  net(10 name($10)
    rect(l2 (1445 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -666,12 +666,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(11
+  net(11 name($11)
    rect(l7 (290 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(12
+  net(12 name($12)
    rect(l2 (290 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -682,17 +682,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(13
+  net(13 name($13)
    rect(l7 (940 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(14
+  net(14 name($14)
    rect(l7 (2470 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(15
+  net(15 name($15)
    polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -703,7 +703,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(16
+  net(16 name($16)
    polygon(l2 (2470 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -714,12 +714,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(17
+  net(17 name($17)
    rect(l7 (3120 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(18
+  net(18 name($18)
    rect(l2 (5805 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -730,12 +730,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(19
+  net(19 name($19)
    rect(l7 (4650 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(20
+  net(20 name($20)
    rect(l2 (4650 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -746,12 +746,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(21
+  net(21 name($21)
    rect(l7 (5300 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(22
+  net(22 name($22)
    rect(l2 (7985 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -762,12 +762,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(23
+  net(23 name($23)
    rect(l7 (6830 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(24
+  net(24 name($24)
    polygon(l2 (6830 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -778,7 +778,7 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(25
+  net(25 name($25)
    rect(l7 (7480 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
diff --git a/testdata/lvs/test_22a.lvsdb.3 b/testdata/lvs/test_22a.lvsdb.3
index 87bbe1b42..efcbfe0ec 100644
--- a/testdata/lvs/test_22a.lvsdb.3
+++ b/testdata/lvs/test_22a.lvsdb.3
@@ -655,7 +655,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l23 (-170 -170) (170 170))
   )
-  net(10
+  net(10 name($10)
    rect(l2 (1445 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -666,12 +666,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(11
+  net(11 name($11)
    rect(l7 (290 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(12
+  net(12 name($12)
    polygon(l2 (290 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -682,12 +682,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(13
+  net(13 name($13)
    rect(l7 (940 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(14
+  net(14 name($14)
    polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -698,12 +698,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(15
+  net(15 name($15)
    rect(l7 (2470 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(16
+  net(16 name($16)
    rect(l2 (2470 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -714,12 +714,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(17
+  net(17 name($17)
    rect(l7 (3120 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(18
+  net(18 name($18)
    rect(l2 (5805 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -730,12 +730,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(19
+  net(19 name($19)
    rect(l7 (4650 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(20
+  net(20 name($20)
    polygon(l2 (4650 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -746,12 +746,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(21
+  net(21 name($21)
    rect(l7 (5300 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(22
+  net(22 name($22)
    rect(l2 (7985 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -762,12 +762,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(23
+  net(23 name($23)
    rect(l7 (6830 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(24
+  net(24 name($24)
    polygon(l2 (6830 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -778,7 +778,7 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(25
+  net(25 name($25)
    rect(l7 (7480 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
@@ -832,16 +832,16 @@ layout(
    rect(l24 (2030 -150) (150 150))
    rect(l24 (2030 -150) (150 150))
   )
-  net(27
+  net(27 name($27)
    polygon(l7 (955 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
-  net(28
+  net(28 name($28)
    polygon(l7 (7495 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
-  net(29
+  net(29 name($29)
    polygon(l7 (3135 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
-  net(30
+  net(30 name($30)
    polygon(l7 (5315 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
   net(31 name('wl[1]')
@@ -893,7 +893,7 @@ layout(
    rect(l24 (2030 -150) (150 150))
    rect(l24 (2030 -150) (150 150))
   )
-  net(32
+  net(32 name($32)
    polygon(l2 (395 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -904,12 +904,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(33
+  net(33 name($33)
    rect(l7 (940 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(34
+  net(34 name($34)
    polygon(l2 (2575 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -920,12 +920,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(35
+  net(35 name($35)
    rect(l7 (3120 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(36
+  net(36 name($36)
    polygon(l2 (4755 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -936,12 +936,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(37
+  net(37 name($37)
    rect(l7 (5300 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(38
+  net(38 name($38)
    polygon(l2 (6935 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -952,12 +952,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(39
+  net(39 name($39)
    rect(l7 (7480 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(40
+  net(40 name($40)
    polygon(l2 (7905 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -968,19 +968,19 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(41
+  net(41 name($41)
    polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(42
+  net(42 name($42)
    polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(43
+  net(43 name($43)
    polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(44
+  net(44 name($44)
    polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(45
+  net(45 name($45)
    polygon(l2 (1365 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -991,17 +991,17 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(46
+  net(46 name($46)
    rect(l7 (290 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(47
+  net(47 name($47)
    rect(l7 (2470 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(48
+  net(48 name($48)
    polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -1012,7 +1012,7 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(49
+  net(49 name($49)
    polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -1023,12 +1023,12 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(50
+  net(50 name($50)
    rect(l7 (4650 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(51
+  net(51 name($51)
    rect(l7 (6830 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
diff --git a/testdata/lvs/test_22b.lvsdb.1 b/testdata/lvs/test_22b.lvsdb.1
index 45724cbcf..8901b4620 100644
--- a/testdata/lvs/test_22b.lvsdb.1
+++ b/testdata/lvs/test_22b.lvsdb.1
@@ -655,12 +655,12 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l23 (-170 -170) (170 170))
   )
-  net(10
+  net(10 name($10)
    rect(l7 (290 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(11
+  net(11 name($11)
    polygon(l2 (1365 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -671,7 +671,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(12
+  net(12 name($12)
    rect(l2 (290 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -682,17 +682,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(13
+  net(13 name($13)
    rect(l7 (940 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(14
+  net(14 name($14)
    rect(l7 (2470 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(15
+  net(15 name($15)
    polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -703,7 +703,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(16
+  net(16 name($16)
    rect(l2 (2470 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -714,17 +714,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(17
+  net(17 name($17)
    rect(l7 (3120 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(18
+  net(18 name($18)
    rect(l7 (4650 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(19
+  net(19 name($19)
    polygon(l2 (5725 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -735,7 +735,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(20
+  net(20 name($20)
    polygon(l2 (4650 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -746,17 +746,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(21
+  net(21 name($21)
    rect(l7 (5300 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(22
+  net(22 name($22)
    rect(l7 (6830 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(23
+  net(23 name($23)
    rect(l2 (7985 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -767,7 +767,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(24
+  net(24 name($24)
    rect(l2 (6830 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -778,7 +778,7 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(25
+  net(25 name($25)
    rect(l7 (7480 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
diff --git a/testdata/lvs/test_22b.lvsdb.2 b/testdata/lvs/test_22b.lvsdb.2
index 7c718f649..330c08995 100644
--- a/testdata/lvs/test_22b.lvsdb.2
+++ b/testdata/lvs/test_22b.lvsdb.2
@@ -655,7 +655,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l23 (-170 -170) (170 170))
   )
-  net(10
+  net(10 name($10)
    rect(l2 (1445 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -666,12 +666,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(11
+  net(11 name($11)
    rect(l7 (290 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(12
+  net(12 name($12)
    rect(l2 (290 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -682,17 +682,17 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(13
+  net(13 name($13)
    rect(l7 (940 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(14
+  net(14 name($14)
    rect(l7 (2470 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(15
+  net(15 name($15)
    polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -703,7 +703,7 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(16
+  net(16 name($16)
    polygon(l2 (2470 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -714,12 +714,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(17
+  net(17 name($17)
    rect(l7 (3120 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(18
+  net(18 name($18)
    rect(l2 (5805 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -730,12 +730,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(19
+  net(19 name($19)
    rect(l7 (4650 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(20
+  net(20 name($20)
    rect(l2 (4650 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -746,12 +746,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(21
+  net(21 name($21)
    rect(l7 (5300 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(22
+  net(22 name($22)
    rect(l2 (7985 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -762,12 +762,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(23
+  net(23 name($23)
    rect(l7 (6830 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(24
+  net(24 name($24)
    polygon(l2 (6830 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -778,7 +778,7 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(25
+  net(25 name($25)
    rect(l7 (7480 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
diff --git a/testdata/lvs/test_22b.lvsdb.3 b/testdata/lvs/test_22b.lvsdb.3
index f2960ffe8..3eef3951a 100644
--- a/testdata/lvs/test_22b.lvsdb.3
+++ b/testdata/lvs/test_22b.lvsdb.3
@@ -655,7 +655,7 @@ layout(
    rect(l23 (-110 -170) (170 170))
    rect(l23 (-170 -170) (170 170))
   )
-  net(10
+  net(10 name($10)
    rect(l2 (1445 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -666,12 +666,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(11
+  net(11 name($11)
    rect(l7 (290 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(12
+  net(12 name($12)
    polygon(l2 (290 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -682,12 +682,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(13
+  net(13 name($13)
    rect(l7 (940 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(14
+  net(14 name($14)
    polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    rect(l2 (-445 -1330) (445 420))
    polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -698,12 +698,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(15
+  net(15 name($15)
    rect(l7 (2470 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(16
+  net(16 name($16)
    rect(l2 (2470 395) (445 420))
    polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
    polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -714,12 +714,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(17
+  net(17 name($17)
    rect(l7 (3120 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(18
+  net(18 name($18)
    rect(l2 (5805 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -730,12 +730,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(19
+  net(19 name($19)
    rect(l7 (4650 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(20
+  net(20 name($20)
    polygon(l2 (4650 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -746,12 +746,12 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(21
+  net(21 name($21)
    rect(l7 (5300 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
   )
-  net(22
+  net(22 name($22)
    rect(l2 (7985 395) (445 420))
    polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
    polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
@@ -762,12 +762,12 @@ layout(
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
-  net(23
+  net(23 name($23)
    rect(l7 (6830 955) (950 150))
    rect(l7 (-1100 -840) (150 2010))
    rect(l7 (950 -1320) (330 270))
   )
-  net(24
+  net(24 name($24)
    polygon(l2 (6830 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
    rect(l2 (-525 -1330) (445 420))
    polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
@@ -778,7 +778,7 @@ layout(
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
   )
-  net(25
+  net(25 name($25)
    rect(l7 (7480 1435) (950 150))
    rect(l7 (-1280 -270) (330 270))
    rect(l7 (950 -1320) (150 2010))
@@ -832,16 +832,16 @@ layout(
    rect(l24 (2030 -150) (150 150))
    rect(l24 (2030 -150) (150 150))
   )
-  net(27
+  net(27 name($27)
    polygon(l7 (955 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
-  net(28
+  net(28 name($28)
    polygon(l7 (7495 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
-  net(29
+  net(29 name($29)
    polygon(l7 (3135 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
-  net(30
+  net(30 name($30)
    polygon(l7 (5315 2305) (0 180) (-690 0) (0 150) (1650 0) (0 -150) (-690 0) (0 -180))
   )
   net(31 name('wl[1]')
@@ -893,7 +893,7 @@ layout(
    rect(l24 (2030 -150) (150 150))
    rect(l24 (2030 -150) (150 150))
   )
-  net(32
+  net(32 name($32)
    polygon(l2 (395 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -904,12 +904,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(33
+  net(33 name($33)
    rect(l7 (940 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(34
+  net(34 name($34)
    polygon(l2 (2575 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -920,12 +920,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(35
+  net(35 name($35)
    rect(l7 (3120 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(36
+  net(36 name($36)
    polygon(l2 (4755 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -936,12 +936,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(37
+  net(37 name($37)
    rect(l7 (5300 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(38
+  net(38 name($38)
    polygon(l2 (6935 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -952,12 +952,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(39
+  net(39 name($39)
    rect(l7 (7480 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(40
+  net(40 name($40)
    polygon(l2 (7905 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -968,19 +968,19 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(41
+  net(41 name($41)
    polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(42
+  net(42 name($42)
    polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(43
+  net(43 name($43)
    polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(44
+  net(44 name($44)
    polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(45
+  net(45 name($45)
    polygon(l2 (1365 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -991,17 +991,17 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(46
+  net(46 name($46)
    rect(l7 (290 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(47
+  net(47 name($47)
    rect(l7 (2470 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(48
+  net(48 name($48)
    polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -1012,7 +1012,7 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(49
+  net(49 name($49)
    polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
    polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
@@ -1023,12 +1023,12 @@ layout(
    rect(l22 (-1100 -1320) (150 2010))
    rect(l22 (950 -960) (330 270))
   )
-  net(50
+  net(50 name($50)
    rect(l7 (4650 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(51
+  net(51 name($51)
    rect(l7 (6830 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
diff --git a/testdata/lvs/test_22c.lvsdb.1 b/testdata/lvs/test_22c.lvsdb.1
index 0fef41270..11a8df549 100644
--- a/testdata/lvs/test_22c.lvsdb.1
+++ b/testdata/lvs/test_22c.lvsdb.1
@@ -181,17 +181,17 @@ layout(
   rect((-385 -485) (2950 3565))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l7 (1890 500) (150 2010))
    rect(l7 (-1100 -1320) (950 150))
    rect(l7 (-1280 -150) (330 270))
   )
-  net(2
+  net(2 name($2)
    rect(l7 (1240 1550) (330 270))
    rect(l7 (-1280 -150) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
   )
-  net(3
+  net(3 name($3)
    polygon(l9 (525 760) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
@@ -202,7 +202,7 @@ layout(
    polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
   )
-  net(4
+  net(4 name($4)
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
diff --git a/testdata/lvs/test_22c.lvsdb.2 b/testdata/lvs/test_22c.lvsdb.2
index 8438d1de6..260035625 100644
--- a/testdata/lvs/test_22c.lvsdb.2
+++ b/testdata/lvs/test_22c.lvsdb.2
@@ -181,17 +181,17 @@ layout(
   rect((-385 -485) (2950 3565))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l7 (1890 500) (150 2010))
    rect(l7 (-1100 -1320) (950 150))
    rect(l7 (-1280 -150) (330 270))
   )
-  net(2
+  net(2 name($2)
    rect(l7 (1240 1550) (330 270))
    rect(l7 (-1280 -150) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
   )
-  net(3
+  net(3 name($3)
    polygon(l9 (525 760) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
@@ -202,7 +202,7 @@ layout(
    polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
   )
-  net(4
+  net(4 name($4)
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
diff --git a/testdata/lvs/test_22c.lvsdb.3 b/testdata/lvs/test_22c.lvsdb.3
index e966c57ac..57186d448 100644
--- a/testdata/lvs/test_22c.lvsdb.3
+++ b/testdata/lvs/test_22c.lvsdb.3
@@ -181,17 +181,17 @@ layout(
   rect((-385 -485) (2950 3565))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l7 (1890 500) (150 2010))
    rect(l7 (-1100 -1320) (950 150))
    rect(l7 (-1280 -150) (330 270))
   )
-  net(2
+  net(2 name($2)
    rect(l7 (1240 1550) (330 270))
    rect(l7 (-1280 -150) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
   )
-  net(3
+  net(3 name($3)
    polygon(l9 (525 760) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
@@ -202,7 +202,7 @@ layout(
    polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
   )
-  net(4
+  net(4 name($4)
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
diff --git a/testdata/lvs/test_22d.lvsdb.1 b/testdata/lvs/test_22d.lvsdb.1
index 73e8005b4..26cf2b536 100644
--- a/testdata/lvs/test_22d.lvsdb.1
+++ b/testdata/lvs/test_22d.lvsdb.1
@@ -181,17 +181,17 @@ layout(
   rect((-385 -485) (2950 3565))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l7 (1890 500) (150 2010))
    rect(l7 (-1100 -1320) (950 150))
    rect(l7 (-1280 -150) (330 270))
   )
-  net(2
+  net(2 name($2)
    rect(l7 (1240 1550) (330 270))
    rect(l7 (-1280 -150) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
   )
-  net(3
+  net(3 name($3)
    polygon(l9 (525 760) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
@@ -202,7 +202,7 @@ layout(
    polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
   )
-  net(4
+  net(4 name($4)
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
diff --git a/testdata/lvs/test_22d.lvsdb.2 b/testdata/lvs/test_22d.lvsdb.2
index 1d4e0d82a..8d1a344a3 100644
--- a/testdata/lvs/test_22d.lvsdb.2
+++ b/testdata/lvs/test_22d.lvsdb.2
@@ -181,17 +181,17 @@ layout(
   rect((-385 -485) (2950 3565))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l7 (1890 500) (150 2010))
    rect(l7 (-1100 -1320) (950 150))
    rect(l7 (-1280 -150) (330 270))
   )
-  net(2
+  net(2 name($2)
    rect(l7 (1240 1550) (330 270))
    rect(l7 (-1280 -150) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
   )
-  net(3
+  net(3 name($3)
    polygon(l9 (525 760) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
@@ -202,7 +202,7 @@ layout(
    polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
   )
-  net(4
+  net(4 name($4)
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
diff --git a/testdata/lvs/test_22d.lvsdb.3 b/testdata/lvs/test_22d.lvsdb.3
index 10a35d95c..61b7ae957 100644
--- a/testdata/lvs/test_22d.lvsdb.3
+++ b/testdata/lvs/test_22d.lvsdb.3
@@ -181,17 +181,17 @@ layout(
   rect((-385 -485) (2950 3565))
 
   # Nets with their geometries
-  net(1
+  net(1 name($1)
    rect(l7 (1890 500) (150 2010))
    rect(l7 (-1100 -1320) (950 150))
    rect(l7 (-1280 -150) (330 270))
   )
-  net(2
+  net(2 name($2)
    rect(l7 (1240 1550) (330 270))
    rect(l7 (-1280 -150) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
   )
-  net(3
+  net(3 name($3)
    polygon(l9 (525 760) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
@@ -202,7 +202,7 @@ layout(
    polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
   )
-  net(4
+  net(4 name($4)
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))