diff --git a/vvp/compile.cc b/vvp/compile.cc
index 0050678c4..61d3e81fe 100644
--- a/vvp/compile.cc
+++ b/vvp/compile.cc
@@ -1512,7 +1512,6 @@ void compile_udp_def(int sequ, char *label, char *name,
 	    u->compile_table(table);
       }
       free(label);
-      delete[] name;
 }
 
 char **compile_udp_table(char **table, char *row)
diff --git a/vvp/udp.cc b/vvp/udp.cc
index 0c45be816..ef8d2f1fd 100644
--- a/vvp/udp.cc
+++ b/vvp/udp.cc
@@ -82,8 +82,9 @@ ostream& operator <<(ostream&o, const struct udp_levels_table&table)
       return o;
 }
 
-vvp_udp_s::vvp_udp_s(char*label, unsigned ports, vvp_bit4_t init, bool type)
-: ports_(ports), init_(init), seq_(type)
+vvp_udp_s::vvp_udp_s(char*label, char*name__, unsigned ports,
+                     vvp_bit4_t init, bool type)
+: name_(name__), ports_(ports), init_(init), seq_(type)
 {
       if (!udp_table)
 	    udp_table = new_symbol_table();
@@ -104,6 +105,7 @@ vvp_udp_s::vvp_udp_s(char*label, unsigned ports, vvp_bit4_t init, bool type)
 
 vvp_udp_s::~vvp_udp_s()
 {
+      delete[] name_;
 }
 
 unsigned vvp_udp_s::port_count() const
@@ -116,10 +118,9 @@ vvp_bit4_t vvp_udp_s::get_init() const
       return init_;
 }
 
-vvp_udp_comb_s::vvp_udp_comb_s(char*label, char*name, unsigned ports)
-: vvp_udp_s(label, ports, BIT4_X, false)
+vvp_udp_comb_s::vvp_udp_comb_s(char*label, char*name__, unsigned ports)
+: vvp_udp_s(label, name__, ports, BIT4_X, false)
 {
-      name_ = name;
       levels0_ = 0;
       levels1_ = 0;
       nlevels0_ = 0;
@@ -295,11 +296,10 @@ void vvp_udp_comb_s::compile_table(char**tab)
       assert(nrows1 == nlevels1_);
 }
 
-vvp_udp_seq_s::vvp_udp_seq_s(char*label, char*name,
+vvp_udp_seq_s::vvp_udp_seq_s(char*label, char*name__,
 			     unsigned ports, vvp_bit4_t init)
-: vvp_udp_s(label, ports, init, true)
+: vvp_udp_s(label, name__, ports, init, true)
 {
-      name_ = name;
       levels0_ = 0;
       levels1_ = 0;
       levelsx_ = 0;
diff --git a/vvp/udp.h b/vvp/udp.h
index 5769b63d0..97b3541a8 100644
--- a/vvp/udp.h
+++ b/vvp/udp.h
@@ -1,7 +1,7 @@
 #ifndef __udp_H
 #define __udp_H
 /*
- * Copyright (c) 2005-2010 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2005-2011 Stephen Williams (steve@icarus.com)
  *
  * (This is a rewrite of code that was ...
  * Copyright (c) 2001 Stephan Boettcher <stephan@nevis.columbia.edu>)
@@ -30,15 +30,16 @@ struct udp_levels_table;
 struct vvp_udp_s {
 
     public:
-      explicit vvp_udp_s(char*label, unsigned ports, vvp_bit4_t init,
-                         bool type);
+      explicit vvp_udp_s(char*label, char*name, unsigned ports,
+                         vvp_bit4_t init, bool type);
       virtual ~vvp_udp_s();
 
 	// Return the number of input ports for the defined UDP. This
 	// does *not* include the current output value for a
 	// sequential UDP.
       unsigned port_count() const;
-      bool is_sequential() const {return seq_;};
+      bool is_sequential() const { return seq_; };
+      char *name() { return name_; }
 
 	// Return the initial output value.
       vvp_bit4_t get_init() const;
@@ -48,6 +49,7 @@ struct vvp_udp_s {
 					  vvp_bit4_t cur_out) =0;
 
     private:
+      char *name_;
       unsigned ports_;
       vvp_bit4_t init_;
       bool seq_;
@@ -112,7 +114,7 @@ extern ostream& operator<< (ostream&o, const struct udp_levels_table&t);
 class vvp_udp_comb_s : public vvp_udp_s {
 
     public:
-      vvp_udp_comb_s(char*label, char*name, unsigned ports);
+      vvp_udp_comb_s(char*label, char*name__, unsigned ports);
       ~vvp_udp_comb_s();
       void compile_table(char**tab);
 
@@ -125,8 +127,6 @@ class vvp_udp_comb_s : public vvp_udp_s {
 				  vvp_bit4_t cur_out);
 
     private:
-      char*name_;
-
 	// Level sensitive rows of the device.
       struct udp_levels_table*levels0_;
       struct udp_levels_table*levels1_;
@@ -180,7 +180,7 @@ struct udp_edges_table {
 class vvp_udp_seq_s : public vvp_udp_s {
 
     public:
-      vvp_udp_seq_s(char*label, char*name, unsigned ports, vvp_bit4_t init);
+      vvp_udp_seq_s(char*label, char*name__, unsigned ports, vvp_bit4_t init);
       ~vvp_udp_seq_s();
 
       void compile_table(char**tab);
@@ -190,8 +190,6 @@ class vvp_udp_seq_s : public vvp_udp_s {
 				  vvp_bit4_t cur_out);
 
     private:
-      char*name_;
-
       vvp_bit4_t test_levels_(const udp_levels_table&cur);
 
 	// Level sensitive rows of the device.