diff --git a/tgt-vhdl/expr.cc b/tgt-vhdl/expr.cc
index 55ef380b3..b3f7f1017 100644
--- a/tgt-vhdl/expr.cc
+++ b/tgt-vhdl/expr.cc
@@ -44,7 +44,7 @@ static vhdl_expr *translate_signal(ivl_expr_t e)
    // Assume all signals are single bits at the moment
    vhdl_type *type = vhdl_type::std_logic();
    
-   return new vhdl_var_ref(ivl_signal_basename(sig), type);
+   return new vhdl_var_ref(get_renamed_signal(sig).c_str(), type);
 }
 
 /*
diff --git a/tgt-vhdl/scope.cc b/tgt-vhdl/scope.cc
index bd5863c86..f6c6c73db 100644
--- a/tgt-vhdl/scope.cc
+++ b/tgt-vhdl/scope.cc
@@ -37,7 +37,7 @@ static vhdl_var_ref *nexus_to_var_ref(vhdl_arch *arch, ivl_nexus_t nexus)
 
       ivl_signal_t sig;
       if ((sig = ivl_nexus_ptr_sig(nexus_ptr))) {
-         const char *signame = ivl_signal_basename(sig);
+         const char *signame = get_renamed_signal(sig).c_str();
          
          vhdl_decl *decl = arch->get_decl(signame);
          assert(decl);
diff --git a/tgt-vhdl/stmt.cc b/tgt-vhdl/stmt.cc
index 6a2076e5f..85773a60f 100644
--- a/tgt-vhdl/stmt.cc
+++ b/tgt-vhdl/stmt.cc
@@ -182,7 +182,7 @@ static int draw_nbassign(vhdl_process *proc, stmt_container *container,
    ivl_lval_t lval = ivl_stmt_lval(stmt, 0);
    ivl_signal_t sig;
    if ((sig = ivl_lval_sig(lval))) {
-      const char *signame = ivl_signal_basename(sig);
+      const char *signame = get_renamed_signal(sig).c_str();
 
       vhdl_decl *decl = proc->get_parent()->get_decl(signame);
       assert(decl);