diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index 68a282140..bec3dd9cc 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -103,13 +103,19 @@ private:
     }
     void visit(AstMemberDType* nodep) override {
         if (!nodep->user1()) {
-            rename(nodep, false);
+            rename(nodep, true);
             iterateChildren(nodep);
         }
     }
     void visit(AstMemberSel* nodep) override {
         if (!nodep->user1()) {
-            rename(nodep, false);
+            rename(nodep, true);
+            iterateChildren(nodep);
+        }
+    }
+    void visit(AstStructSel* nodep) override {
+        if (!nodep->user1()) {
+            rename(nodep, true);
             iterateChildren(nodep);
         }
     }
diff --git a/test_regress/t/t_class_field_name.pl b/test_regress/t/t_class_field_name.pl
new file mode 100755
index 000000000..aabcde63e
--- /dev/null
+++ b/test_regress/t/t_class_field_name.pl
@@ -0,0 +1,21 @@
+#!/usr/bin/env perl
+if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2020 by Wilson Snyder. This program is free software; you
+# can redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+
+scenarios(simulator => 1);
+
+compile(
+    );
+
+execute(
+    check_finished => 1,
+    );
+
+ok(1);
+1;
diff --git a/test_regress/t/t_class_field_name.v b/test_regress/t/t_class_field_name.v
new file mode 100644
index 000000000..af7a73828
--- /dev/null
+++ b/test_regress/t/t_class_field_name.v
@@ -0,0 +1,21 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2023 by Antmicro Ltd.
+// SPDX-License-Identifier: CC0-1.0
+
+class Cls;
+   int queue;
+endclass
+
+module t (/*AUTOARG*/);
+
+   initial begin
+      Cls cls = new;
+      cls.queue = 1;
+      if (cls.queue == 1) begin
+         $write("*-* All Finished *-*\n");
+         $finish;
+      end
+   end
+endmodule