diff --git a/src/spicelib/parser/inp2b.c b/src/spicelib/parser/inp2b.c
index b4f3b844f..67c7741b3 100644
--- a/src/spicelib/parser/inp2b.c
+++ b/src/spicelib/parser/inp2b.c
@@ -42,7 +42,7 @@ void INP2B(CKTcircuit *ckt, INPtables * tab, struct card *current)
         ckt->CKTvarHertz = 1;
         
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
 
     INPgetNetTok(&line, &nname1, 1);
diff --git a/src/spicelib/parser/inp2e.c b/src/spicelib/parser/inp2e.c
index 45f0c1451..0b065f5ad 100644
--- a/src/spicelib/parser/inp2e.c
+++ b/src/spicelib/parser/inp2e.c
@@ -40,7 +40,7 @@ void INP2E(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2f.c b/src/spicelib/parser/inp2f.c
index c099dbda5..f343869d3 100644
--- a/src/spicelib/parser/inp2f.c
+++ b/src/spicelib/parser/inp2f.c
@@ -37,7 +37,7 @@ void INP2F(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2g.c b/src/spicelib/parser/inp2g.c
index 659490b96..d9fd061ab 100644
--- a/src/spicelib/parser/inp2g.c
+++ b/src/spicelib/parser/inp2g.c
@@ -40,7 +40,7 @@ void INP2G(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2h.c b/src/spicelib/parser/inp2h.c
index c558647e9..86e43db8c 100644
--- a/src/spicelib/parser/inp2h.c
+++ b/src/spicelib/parser/inp2h.c
@@ -37,7 +37,7 @@ void INP2H(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2i.c b/src/spicelib/parser/inp2i.c
index cec95080f..174f5fbde 100644
--- a/src/spicelib/parser/inp2i.c
+++ b/src/spicelib/parser/inp2i.c
@@ -38,7 +38,7 @@ void INP2I(CKTcircuit *ckt, INPtables * tab, struct card *current)
         }
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2v.c b/src/spicelib/parser/inp2v.c
index 09153988f..5df06100f 100644
--- a/src/spicelib/parser/inp2v.c
+++ b/src/spicelib/parser/inp2v.c
@@ -38,7 +38,7 @@ void INP2V(CKTcircuit *ckt, INPtables * tab, struct card *current)
         }
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);