diff -r 3f2fcad4d876 src/vhdl/translate/trans-chap9.adb
--- a/src/vhdl/translate/trans-chap9.adb	Sun Mar 22 19:04:08 2015 +0100
+++ b/src/vhdl/translate/trans-chap9.adb	Tue Mar 31 17:15:51 2015 +0200
@@ -1420,15 +1420,15 @@
             function Get_Arch_Name return String is
             begin
                if Arch /= Null_Iir then
-                  return "ARCH__" & Image_Identifier (Arch);
+                  return "ARCH__" & Trans_Identifier (Arch);
                else
                   return "LASTARCH";
                end if;
             end Get_Arch_Name;
 
             Str       : constant String :=
-              Image_Identifier (Get_Library (Get_Design_File (Entity_Unit)))
-              & "__" & Image_Identifier (Entity) & "__"
+              Trans_Identifier (Get_Library (Get_Design_File (Entity_Unit)))
+              & "__" & Trans_Identifier (Entity) & "__"
               & Get_Arch_Name & "__";
             Sub_Inter : O_Inter_List;
             Arg       : O_Dnode;
diff -r 3f2fcad4d876 src/vhdl/translate/trans.adb
--- a/src/vhdl/translate/trans.adb	Sun Mar 22 19:04:08 2015 +0100
+++ b/src/vhdl/translate/trans.adb	Tue Mar 31 17:15:51 2015 +0200
@@ -785,8 +785,16 @@
             Add_Name (Len, Id);
          end if;
       end Add_Identifier;
+      
+      --  Create an identifier from IIR node ID without the prefix.
+      function Trans_Identifier (Id : Iir) return String
+      is
+	 use Name_Table;
+      begin
+         Name_Id_To_String (Get_Identifier (Id));
+         return Nam_Buffer (1 .. Nam_Length);
+      end Trans_Identifier;
 
-      --  Create an identifier from IIR node ID without the prefix.
       function Create_Identifier_Without_Prefix (Id : Iir) return O_Ident
       is
          use Name_Table;
diff -r 3f2fcad4d876 src/vhdl/translate/trans.ads
--- a/src/vhdl/translate/trans.ads	Sun Mar 22 19:04:08 2015 +0100
+++ b/src/vhdl/translate/trans.ads	Tue Mar 31 17:15:51 2015 +0200
@@ -315,6 +315,7 @@
       procedure Restore_Local_Identifier (Id : Local_Identifier_Type);
 
       --  Create an identifier from IIR node ID without the prefix.
+      function Trans_Identifier (Id : Iir) return String;
       function Create_Identifier_Without_Prefix (Id : Iir) return O_Ident;
       function Create_Identifier_Without_Prefix (Id : Name_Id; Str : String)
                                                  return O_Ident;