diff --git a/tools/netlist/netlist.cpp b/tools/netlist/netlist.cpp
index 286a9ee20..91b26f7ad 100644
--- a/tools/netlist/netlist.cpp
+++ b/tools/netlist/netlist.cpp
@@ -93,12 +93,11 @@ class NetlistNode : public Node<NetlistNode, NetlistEdge> {
   void addMemberAccess(string_view name) {
     selectors.emplace_back(std::make_unique<VariableMemberAccess>(name));
   }
-  void setName(string_view newName) { name = newName; }
-  string_view getName() const { return name; }
+  string_view getName() const { return symbol->name; }
 
 public:
   size_t ID;
-  string_view name;
+  const Symbol *symbol;
 
 private:
   static size_t nextID;
@@ -124,8 +123,7 @@ class VariableReferenceVisitor : public ASTVisitor<VariableReferenceVisitor, fal
   void handle(const NamedValueExpression &expr) {
     auto &node = netlist.addNode();
     visitList.push_back(&node);
-    node.setName(expr.symbol.name);
-    //std::cout<<"Got node "<<node.getName()<<"\n";
+    node.symbol = &(expr.symbol);
     for (auto *selector : selectors) {
       if (selector->kind == ExpressionKind::ElementSelect) {
         auto index = selector->as<ElementSelectExpression>().selector().eval(evalCtx);
@@ -230,6 +228,13 @@ class UnrollVisitor : public ASTVisitor<UnrollVisitor, true, false> {
 
   void handle(const PortSymbol &symbol) {
     std::cout << "PortSymbol " << symbol.name << "\n";
+    auto &node = netlist.addNode();
+    node.symbol = &symbol;
+  }
+
+  void handle(const ContinuousAssignSymbol &symbol) {
+    AssignmentVisitor visitor(netlist, evalCtx);
+    symbol.visit(visitor);
   }
 
   void handle(const ForLoopStatement& loop) {
@@ -345,11 +350,6 @@ class UnrollVisitor : public ASTVisitor<UnrollVisitor, true, false> {
     stmt.visit(visitor);
   }
 
-  void handle(const ContinuousAssignSymbol &symbol) {
-    AssignmentVisitor visitor(netlist, evalCtx);
-    symbol.visit(visitor);
-  }
-
 private:
   bool step() {
     if (anyErrors || !evalCtx.step(SourceLocation::NoLocation)) {