Rename of Iir_Kinds_Library_Unit

11 files changed, 117 insertions, 126 deletions

diff --git a/src/libraries.adb b/src/libraries.adb
index c61084db6..64471f6b6 100644
--- a/src/libraries.adb
+++ b/src/libraries.adb
@@ -200,20 +200,15 @@ package body Libraries is
 
    --  Get the hash value for DESIGN_UNIT.
    --  Architectures use the entity name.
-   function Get_Hash_Id_For_Unit (Design_Unit : Iir_Design_Unit)
-                                 return Hash_Id
+   function Get_Hash_Id_For_Unit (Design_Unit : Iir_Design_Unit) return Hash_Id
    is
       Lib_Unit : Iir;
       Id : Name_Id;
    begin
       Lib_Unit := Get_Library_Unit (Design_Unit);
-      case Iir_Kinds_Library_Unit_Declaration (Get_Kind (Lib_Unit)) is
-         when Iir_Kind_Entity_Declaration
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Package_Declaration
-           | Iir_Kind_Package_Body
-           | Iir_Kind_Package_Instantiation_Declaration
-           | Iir_Kind_Context_Declaration =>
+      case Iir_Kinds_Library_Unit (Get_Kind (Lib_Unit)) is
+         when Iir_Kinds_Primary_Unit
+           | Iir_Kind_Package_Body =>
             Id := Get_Identifier (Lib_Unit);
          when Iir_Kind_Architecture_Body =>
             --  Architectures are put with the entity identifier.
@@ -828,13 +823,9 @@ package body Libraries is
                end if;
             end;
             Lib_Unit := Get_Library_Unit (Unit);
-            case Iir_Kinds_Library_Unit_Declaration (Get_Kind (Lib_Unit)) is
-               when Iir_Kind_Entity_Declaration
-                 | Iir_Kind_Configuration_Declaration
-                 | Iir_Kind_Package_Declaration
-                 | Iir_Kind_Package_Body
-                 | Iir_Kind_Package_Instantiation_Declaration
-                 | Iir_Kind_Context_Declaration =>
+            case Iir_Kinds_Library_Unit (Get_Kind (Lib_Unit)) is
+               when Iir_Kinds_Primary_Unit
+                 | Iir_Kind_Package_Body =>
                   return Get_Identifier (Dep) = Get_Identifier (Lib_Unit);
                when Iir_Kind_Architecture_Body =>
                   return False;
@@ -1873,19 +1864,12 @@ package body Libraries is
          if Get_Identifier (Unit) = Name
            and then Get_Library (Get_Design_File (Unit)) = Library
          then
-            case Get_Kind (Get_Library_Unit (Unit)) is
-               when Iir_Kind_Package_Declaration
-                 | Iir_Kind_Package_Instantiation_Declaration
-                 | Iir_Kind_Entity_Declaration
-                 | Iir_Kind_Configuration_Declaration
-                 | Iir_Kind_Context_Declaration =>
+            case Iir_Kinds_Library_Unit (Get_Kind (Get_Library_Unit (Unit))) is
+               when Iir_Kinds_Primary_Unit =>
                   --  Only return a primary unit.
                   return Unit;
-               when Iir_Kind_Package_Body
-                 | Iir_Kind_Architecture_Body =>
+               when Iir_Kinds_Secondary_Unit =>
                   null;
-               when others =>
-                  raise Internal_Error;
             end case;
          end if;
          Unit := Get_Hash_Chain (Unit);
diff --git a/src/vhdl/configuration.adb b/src/vhdl/configuration.adb
index 1d32b9c1f..6216311b9 100644
--- a/src/vhdl/configuration.adb
+++ b/src/vhdl/configuration.adb
@@ -785,7 +785,7 @@ package body Configuration is
             return Walk_Continue;
          end if;
 
-         case Iir_Kinds_Library_Unit_Declaration (Kind) is
+         case Iir_Kinds_Library_Unit (Kind) is
             when Iir_Kind_Architecture_Body
               | Iir_Kind_Configuration_Declaration =>
                Libraries.Load_Design_Unit (Design, Null_Iir);
@@ -875,7 +875,7 @@ package body Configuration is
             return Walk_Continue;
          end if;
 
-         case Iir_Kinds_Library_Unit_Declaration (Get_Kind (Unit)) is
+         case Iir_Kinds_Library_Unit (Get_Kind (Unit)) is
             when Iir_Kind_Architecture_Body =>
                Status := Walk_Concurrent_Statements_Chain
                  (Get_Concurrent_Statement_Chain (Unit),
diff --git a/src/vhdl/elocations.adb b/src/vhdl/elocations.adb
index 13ed06fa6..e9fedc93e 100644
--- a/src/vhdl/elocations.adb
+++ b/src/vhdl/elocations.adb
@@ -402,10 +402,10 @@ package body Elocations is
            | Iir_Kind_Protected_Type_Body
            | Iir_Kind_Type_Declaration
            | Iir_Kind_Subtype_Declaration
-           | Iir_Kind_Package_Declaration
-           | Iir_Kind_Package_Body
            | Iir_Kind_Configuration_Declaration
            | Iir_Kind_Context_Declaration
+           | Iir_Kind_Package_Declaration
+           | Iir_Kind_Package_Body
            | Iir_Kind_Case_Statement =>
             return Format_L2;
          when Iir_Kind_Package_Instantiation_Declaration
diff --git a/src/vhdl/elocations_meta.adb b/src/vhdl/elocations_meta.adb
index c3013392a..1dcbdeb53 100644
--- a/src/vhdl/elocations_meta.adb
+++ b/src/vhdl/elocations_meta.adb
@@ -139,13 +139,13 @@ package body Elocations_Meta is
            | Iir_Kind_Type_Declaration
            | Iir_Kind_Anonymous_Type_Declaration
            | Iir_Kind_Subtype_Declaration
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Component_Declaration
            | Iir_Kind_Attribute_Declaration
            | Iir_Kind_Group_Template_Declaration
@@ -196,13 +196,13 @@ package body Elocations_Meta is
          when Iir_Kind_Protected_Type_Declaration
            | Iir_Kind_Record_Type_Definition
            | Iir_Kind_Protected_Type_Body
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Component_Declaration
            | Iir_Kind_Function_Body
            | Iir_Kind_Procedure_Body
diff --git a/src/vhdl/evaluation.adb b/src/vhdl/evaluation.adb
index 94a142403..95b97fd54 100644
--- a/src/vhdl/evaluation.adb
+++ b/src/vhdl/evaluation.adb
@@ -3832,7 +3832,7 @@ package body Evaluation is
             Path_Add_Element (Get_Parent (Prefix), Is_Instance);
             Path_Add_Name (Prefix);
          when Iir_Kind_Library_Declaration
-           | Iir_Kinds_Library_Unit_Declaration
+           | Iir_Kinds_Library_Unit
            | Iir_Kind_Function_Declaration
            | Iir_Kind_Procedure_Declaration
            | Iir_Kinds_Concurrent_Statement
diff --git a/src/vhdl/iirs.adb b/src/vhdl/iirs.adb
index 3e0e7b70a..59eae26e3 100644
--- a/src/vhdl/iirs.adb
+++ b/src/vhdl/iirs.adb
@@ -310,9 +310,9 @@ package body Iirs is
            | Iir_Kind_Subtype_Declaration
            | Iir_Kind_Nature_Declaration
            | Iir_Kind_Subnature_Declaration
-           | Iir_Kind_Package_Body
            | Iir_Kind_Configuration_Declaration
            | Iir_Kind_Context_Declaration
+           | Iir_Kind_Package_Body
            | Iir_Kind_Unit_Declaration
            | Iir_Kind_Library_Declaration
            | Iir_Kind_Attribute_Declaration
@@ -481,9 +481,9 @@ package body Iirs is
            | Iir_Kind_Floating_Subtype_Definition
            | Iir_Kind_Subtype_Definition
            | Iir_Kind_Scalar_Nature_Definition
+           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
            | Iir_Kind_Package_Header
            | Iir_Kind_Component_Declaration
diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads
index 08542f705..1ff1934ea 100644
--- a/src/vhdl/iirs.ads
+++ b/src/vhdl/iirs.ads
@@ -4133,13 +4133,13 @@ package Iirs is
       Iir_Kind_Subtype_Declaration,
       Iir_Kind_Nature_Declaration,
       Iir_Kind_Subnature_Declaration,
+      Iir_Kind_Entity_Declaration,
+      Iir_Kind_Configuration_Declaration,
+      Iir_Kind_Context_Declaration,
       Iir_Kind_Package_Declaration,
       Iir_Kind_Package_Instantiation_Declaration,
       Iir_Kind_Package_Body,
-      Iir_Kind_Configuration_Declaration,
-      Iir_Kind_Entity_Declaration,
       Iir_Kind_Architecture_Body,
-      Iir_Kind_Context_Declaration,
       Iir_Kind_Package_Header,
       Iir_Kind_Unit_Declaration,
       Iir_Kind_Library_Declaration,
@@ -4907,18 +4907,25 @@ package Iirs is
    -- * comments line
    -- * the last line must be the highest bound of the range, followed by ";"
 
---   subtype Iir_Kinds_List is Iir_Kind range
---     Iir_Kind_List ..
---     Iir_Kind_Callees_List;
-
-   subtype Iir_Kinds_Library_Unit_Declaration is Iir_Kind range
-     Iir_Kind_Package_Declaration ..
+   subtype Iir_Kinds_Library_Unit is Iir_Kind range
+     Iir_Kind_Entity_Declaration ..
+   --Iir_Kind_Configuration_Declaration
+   --Iir_Kind_Context_Declaration
+   --Iir_Kind_Package_Declaration
    --Iir_Kind_Package_Instantiation_Declaration
    --Iir_Kind_Package_Body
+     Iir_Kind_Architecture_Body;
+
+   subtype Iir_Kinds_Primary_Unit is Iir_Kind range
+     Iir_Kind_Entity_Declaration ..
    --Iir_Kind_Configuration_Declaration
-   --Iir_Kind_Entity_Declaration
-   --Iir_Kind_Architecture_Body
-     Iir_Kind_Context_Declaration;
+   --Iir_Kind_Context_Declaration
+   --Iir_Kind_Package_Declaration
+     Iir_Kind_Package_Instantiation_Declaration;
+
+   subtype Iir_Kinds_Secondary_Unit is Iir_Kind range
+     Iir_Kind_Package_Body ..
+     Iir_Kind_Architecture_Body;
 
    subtype Iir_Kinds_Package_Declaration is Iir_Kind range
      Iir_Kind_Package_Declaration ..
diff --git a/src/vhdl/iirs_utils.adb b/src/vhdl/iirs_utils.adb
index a14f0523c..713230e78 100644
--- a/src/vhdl/iirs_utils.adb
+++ b/src/vhdl/iirs_utils.adb
@@ -304,7 +304,7 @@ package body Iirs_Utils is
               | Iir_Kind_Use_Clause
               | Iir_Kind_Context_Reference
               | Iir_Kind_Library_Declaration
-              | Iir_Kinds_Library_Unit_Declaration
+              | Iir_Kinds_Library_Unit
               | Iir_Kind_Component_Declaration
               | Iir_Kind_Function_Declaration
               | Iir_Kind_Procedure_Declaration
diff --git a/src/vhdl/nodes_meta.adb b/src/vhdl/nodes_meta.adb
index 9066426ca..cc6e78910 100644
--- a/src/vhdl/nodes_meta.adb
+++ b/src/vhdl/nodes_meta.adb
@@ -1163,20 +1163,20 @@ package body Nodes_Meta is
             return "nature_declaration";
          when Iir_Kind_Subnature_Declaration =>
             return "subnature_declaration";
+         when Iir_Kind_Entity_Declaration =>
+            return "entity_declaration";
+         when Iir_Kind_Configuration_Declaration =>
+            return "configuration_declaration";
+         when Iir_Kind_Context_Declaration =>
+            return "context_declaration";
          when Iir_Kind_Package_Declaration =>
             return "package_declaration";
          when Iir_Kind_Package_Instantiation_Declaration =>
             return "package_instantiation_declaration";
          when Iir_Kind_Package_Body =>
             return "package_body";
-         when Iir_Kind_Configuration_Declaration =>
-            return "configuration_declaration";
-         when Iir_Kind_Entity_Declaration =>
-            return "entity_declaration";
          when Iir_Kind_Architecture_Body =>
             return "architecture_body";
-         when Iir_Kind_Context_Declaration =>
-            return "context_declaration";
          when Iir_Kind_Package_Header =>
             return "package_header";
          when Iir_Kind_Unit_Declaration =>
@@ -2769,6 +2769,36 @@ package body Nodes_Meta is
       Field_Parent,
       Field_Nature,
       Field_Chain,
+      --  Iir_Kind_Entity_Declaration
+      Field_Identifier,
+      Field_Has_Begin,
+      Field_Visible_Flag,
+      Field_Is_Within_Flag,
+      Field_End_Has_Reserved_Id,
+      Field_End_Has_Identifier,
+      Field_Parent,
+      Field_Generic_Chain,
+      Field_Port_Chain,
+      Field_Declaration_Chain,
+      Field_Concurrent_Statement_Chain,
+      Field_Attribute_Value_Chain,
+      --  Iir_Kind_Configuration_Declaration
+      Field_Identifier,
+      Field_Visible_Flag,
+      Field_End_Has_Reserved_Id,
+      Field_End_Has_Identifier,
+      Field_Parent,
+      Field_Declaration_Chain,
+      Field_Entity_Name,
+      Field_Attribute_Value_Chain,
+      Field_Block_Configuration,
+      --  Iir_Kind_Context_Declaration
+      Field_Identifier,
+      Field_Visible_Flag,
+      Field_End_Has_Reserved_Id,
+      Field_End_Has_Identifier,
+      Field_Parent,
+      Field_Context_Items,
       --  Iir_Kind_Package_Declaration
       Field_Identifier,
       Field_Need_Body,
@@ -2807,29 +2837,6 @@ package body Nodes_Meta is
       Field_Chain,
       Field_Attribute_Value_Chain,
       Field_Package,
-      --  Iir_Kind_Configuration_Declaration
-      Field_Identifier,
-      Field_Visible_Flag,
-      Field_End_Has_Reserved_Id,
-      Field_End_Has_Identifier,
-      Field_Parent,
-      Field_Declaration_Chain,
-      Field_Entity_Name,
-      Field_Attribute_Value_Chain,
-      Field_Block_Configuration,
-      --  Iir_Kind_Entity_Declaration
-      Field_Identifier,
-      Field_Has_Begin,
-      Field_Visible_Flag,
-      Field_Is_Within_Flag,
-      Field_End_Has_Reserved_Id,
-      Field_End_Has_Identifier,
-      Field_Parent,
-      Field_Generic_Chain,
-      Field_Port_Chain,
-      Field_Declaration_Chain,
-      Field_Concurrent_Statement_Chain,
-      Field_Attribute_Value_Chain,
       --  Iir_Kind_Architecture_Body
       Field_Identifier,
       Field_Foreign_Flag,
@@ -2843,13 +2850,6 @@ package body Nodes_Meta is
       Field_Concurrent_Statement_Chain,
       Field_Attribute_Value_Chain,
       Field_Default_Configuration_Declaration,
-      --  Iir_Kind_Context_Declaration
-      Field_Identifier,
-      Field_Visible_Flag,
-      Field_End_Has_Reserved_Id,
-      Field_End_Has_Identifier,
-      Field_Parent,
-      Field_Context_Items,
       --  Iir_Kind_Package_Header
       Field_Generic_Chain,
       Field_Generic_Map_Aspect_Chain,
@@ -4457,13 +4457,13 @@ package body Nodes_Meta is
       Iir_Kind_Subtype_Declaration => 476,
       Iir_Kind_Nature_Declaration => 482,
       Iir_Kind_Subnature_Declaration => 488,
-      Iir_Kind_Package_Declaration => 502,
-      Iir_Kind_Package_Instantiation_Declaration => 515,
-      Iir_Kind_Package_Body => 523,
-      Iir_Kind_Configuration_Declaration => 532,
-      Iir_Kind_Entity_Declaration => 544,
-      Iir_Kind_Architecture_Body => 556,
-      Iir_Kind_Context_Declaration => 562,
+      Iir_Kind_Entity_Declaration => 500,
+      Iir_Kind_Configuration_Declaration => 509,
+      Iir_Kind_Context_Declaration => 515,
+      Iir_Kind_Package_Declaration => 529,
+      Iir_Kind_Package_Instantiation_Declaration => 542,
+      Iir_Kind_Package_Body => 550,
+      Iir_Kind_Architecture_Body => 562,
       Iir_Kind_Package_Header => 564,
       Iir_Kind_Unit_Declaration => 572,
       Iir_Kind_Library_Declaration => 579,
@@ -7055,11 +7055,11 @@ package body Nodes_Meta is
    function Has_Attribute_Value_Chain (K : Iir_Kind) return Boolean is
    begin
       case K is
-         when Iir_Kind_Package_Declaration
+         when Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
            | Iir_Kind_Function_Body
            | Iir_Kind_Procedure_Body
@@ -7285,8 +7285,8 @@ package body Nodes_Meta is
    begin
       case K is
          when Iir_Kind_Block_Header
-           | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Header
            | Iir_Kind_Component_Declaration
            | Iir_Kind_Function_Declaration
@@ -7781,13 +7781,13 @@ package body Nodes_Meta is
    function Has_Design_Unit (K : Iir_Kind) return Boolean is
    begin
       case K is
-         when Iir_Kind_Package_Declaration
+         when Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
+           | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
-           | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration =>
+           | Iir_Kind_Architecture_Body =>
             return True;
          when others =>
             return False;
@@ -7811,11 +7811,11 @@ package body Nodes_Meta is
          when Iir_Kind_Block_Configuration
            | Iir_Kind_Protected_Type_Declaration
            | Iir_Kind_Protected_Type_Body
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
            | Iir_Kind_Function_Body
            | Iir_Kind_Procedure_Body
@@ -7981,13 +7981,13 @@ package body Nodes_Meta is
            | Iir_Kind_Subtype_Declaration
            | Iir_Kind_Nature_Declaration
            | Iir_Kind_Subnature_Declaration
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Unit_Declaration
            | Iir_Kind_Library_Declaration
            | Iir_Kind_Component_Declaration
@@ -8118,12 +8118,12 @@ package body Nodes_Meta is
            | Iir_Kind_Subtype_Declaration
            | Iir_Kind_Nature_Declaration
            | Iir_Kind_Subnature_Declaration
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Unit_Declaration
            | Iir_Kind_Library_Declaration
            | Iir_Kind_Component_Declaration
@@ -9178,13 +9178,13 @@ package body Nodes_Meta is
            | Iir_Kind_Subtype_Declaration
            | Iir_Kind_Nature_Declaration
            | Iir_Kind_Subnature_Declaration
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Unit_Declaration
            | Iir_Kind_Component_Declaration
            | Iir_Kind_Attribute_Declaration
@@ -10291,13 +10291,13 @@ package body Nodes_Meta is
            | Iir_Kind_Record_Type_Definition
            | Iir_Kind_Physical_Type_Definition
            | Iir_Kind_Protected_Type_Body
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Component_Declaration
            | Iir_Kind_Function_Body
            | Iir_Kind_Procedure_Body
@@ -10320,13 +10320,13 @@ package body Nodes_Meta is
            | Iir_Kind_Record_Type_Definition
            | Iir_Kind_Physical_Type_Definition
            | Iir_Kind_Protected_Type_Body
+           | Iir_Kind_Entity_Declaration
+           | Iir_Kind_Configuration_Declaration
+           | Iir_Kind_Context_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
            | Iir_Kind_Package_Body
-           | Iir_Kind_Configuration_Declaration
-           | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
-           | Iir_Kind_Context_Declaration
            | Iir_Kind_Component_Declaration
            | Iir_Kind_Function_Body
            | Iir_Kind_Procedure_Body
diff --git a/src/vhdl/sem_names.adb b/src/vhdl/sem_names.adb
index b96e357c7..45c5638ca 100644
--- a/src/vhdl/sem_names.adb
+++ b/src/vhdl/sem_names.adb
@@ -1609,7 +1609,7 @@ package body Sem_Names is
       Name_Res : Iir;
    begin
       case Get_Kind (Res) is
-         when Iir_Kinds_Library_Unit_Declaration =>
+         when Iir_Kinds_Library_Unit =>
             return Finish_Sem_Denoting_Name (Name, Res);
          when Iir_Kinds_Sequential_Statement
            | Iir_Kinds_Concurrent_Statement =>
@@ -2742,7 +2742,7 @@ package body Sem_Names is
            | Iir_Kind_Psl_Endpoint_Declaration =>
             Res := Sem_Psl.Sem_Psl_Name (Name);
 
-         when Iir_Kinds_Library_Unit_Declaration =>
+         when Iir_Kinds_Library_Unit =>
             Error_Msg_Sem (+Name, "function name is a design unit");
 
          when Iir_Kind_Error =>
@@ -2908,7 +2908,7 @@ package body Sem_Names is
            | Iir_Kind_Enumeration_Literal
            | Iir_Kind_Unit_Declaration
            | Iir_Kind_Component_Declaration
-           | Iir_Kinds_Library_Unit_Declaration =>
+           | Iir_Kinds_Library_Unit =>
             --  FIXME: to complete
             null;
          when Iir_Kinds_Sequential_Statement
@@ -3545,7 +3545,7 @@ package body Sem_Names is
            | Iir_Kind_Group_Declaration
            | Iir_Kind_Group_Template_Declaration
            | Iir_Kind_File_Declaration
-           | Iir_Kinds_Library_Unit_Declaration
+           | Iir_Kinds_Library_Unit
            | Iir_Kind_Non_Object_Alias_Declaration =>
             null;
 
diff --git a/src/vhdl/sem_specs.adb b/src/vhdl/sem_specs.adb
index 2c94e0622..a23d4bc1c 100644
--- a/src/vhdl/sem_specs.adb
+++ b/src/vhdl/sem_specs.adb
@@ -410,7 +410,7 @@ package body Sem_Specs is
       procedure Sem_Named_Entity (Ent : Iir) is
       begin
          case Get_Kind (Ent) is
-            when Iir_Kinds_Library_Unit_Declaration
+            when Iir_Kinds_Library_Unit
               | Iir_Kinds_Concurrent_Statement
               | Iir_Kinds_Sequential_Statement
               | Iir_Kinds_Non_Alias_Object_Declaration