Renamed '_?[nN]ame: str' to '_?[iI]dentifier: str'.

7 files changed, 106 insertions, 106 deletions

diff --git a/pyGHDL/dom/Attribute.py b/pyGHDL/dom/Attribute.py
index 8c7b08190..3fef7494c 100644
--- a/pyGHDL/dom/Attribute.py
+++ b/pyGHDL/dom/Attribute.py
@@ -48,8 +48,8 @@ from pyGHDL.dom.Symbol import SimpleSubTypeSymbol
 
 @export
 class Attribute(VHDLModel_Attribute, DOMMixin):
-    def __init__(self, node: Iir, name: str, subType: SubTypeOrSymbol):
-        super().__init__(name, subType)
+    def __init__(self, node: Iir, identifier: str, subType: SubTypeOrSymbol):
+        super().__init__(identifier, subType)
         DOMMixin.__init__(self, node)
 
     @classmethod
diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py
index c4f19deef..54816aef1 100644
--- a/pyGHDL/dom/DesignUnit.py
+++ b/pyGHDL/dom/DesignUnit.py
@@ -96,13 +96,13 @@ class Entity(VHDLModel_Entity, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         genericItems: List[GenericInterfaceItem] = None,
         portItems: List[PortInterfaceItem] = None,
         declaredItems: List = None,
         bodyItems: List["ConcurrentStatement"] = None,
     ):
-        super().__init__(name, genericItems, portItems, declaredItems, bodyItems)
+        super().__init__(identifier, genericItems, portItems, declaredItems, bodyItems)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -123,12 +123,12 @@ class Architecture(VHDLModel_Architecture, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         entity: EntityOrSymbol,
         declaredItems: List = None,
         bodyItems: List["ConcurrentStatement"] = None,
     ):
-        super().__init__(name, entity, declaredItems, bodyItems)
+        super().__init__(identifier, entity, declaredItems, bodyItems)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -153,11 +153,11 @@ class Component(VHDLModel_Component, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         genericItems: List[GenericInterfaceItem] = None,
         portItems: List[PortInterfaceItem] = None,
     ):
-        super().__init__(name, genericItems, portItems)
+        super().__init__(identifier, genericItems, portItems)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -174,11 +174,11 @@ class Package(VHDLModel_Package, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         genericItems: List[GenericInterfaceItem] = None,
         declaredItems: List = None,
     ):
-        super().__init__(name, genericItems, declaredItems)
+        super().__init__(identifier, genericItems, declaredItems)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -205,10 +205,10 @@ class PackageBody(VHDLModel_PackageBody, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         declaredItems: List = None,
     ):
-        super().__init__(name, declaredItems)
+        super().__init__(identifier, declaredItems)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -226,11 +226,11 @@ class PackageInstantiation(VHDLModel_PackageInstantiation, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         uninstantiatedPackageName: Name,
         #        genericItems: List[GenericInterfaceItem] = None,
     ):
-        super().__init__(name, uninstantiatedPackageName)
+        super().__init__(identifier, uninstantiatedPackageName)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -249,9 +249,9 @@ class Context(VHDLModel_Context, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
     ):
-        super().__init__(name)
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -268,9 +268,9 @@ class Configuration(VHDLModel_Configuration, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
     ):
-        super().__init__(name)
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
     @classmethod
diff --git a/pyGHDL/dom/InterfaceItem.py b/pyGHDL/dom/InterfaceItem.py
index 31e2058cb..72f79d694 100644
--- a/pyGHDL/dom/InterfaceItem.py
+++ b/pyGHDL/dom/InterfaceItem.py
@@ -63,12 +63,12 @@ class GenericConstantInterfaceItem(VHDLModel_GenericConstantInterfaceItem, DOMMi
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         mode: Mode,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression,
     ):
-        super().__init__(name, mode, subType, defaultExpression)
+        super().__init__(identifier, mode, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -87,9 +87,9 @@ class GenericTypeInterfaceItem(VHDLModel_GenericTypeInterfaceItem, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
     ):
-        super().__init__(name)
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -121,9 +121,9 @@ class GenericProcedureInterfaceItem(VHDLModel_GenericProcedureInterfaceItem, DOM
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
     ):
-        super().__init__(name)
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -138,9 +138,9 @@ class GenericFunctionInterfaceItem(VHDLModel_GenericFunctionInterfaceItem, DOMMi
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
     ):
-        super().__init__(name)
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -155,12 +155,12 @@ class PortSignalInterfaceItem(VHDLModel_PortSignalInterfaceItem, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         mode: Mode,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression = None,
     ):
-        super().__init__(name, mode, subType, defaultExpression)
+        super().__init__(identifier, mode, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -186,12 +186,12 @@ class ParameterConstantInterfaceItem(
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         mode: Mode,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression = None,
     ):
-        super().__init__(name, mode, subType, defaultExpression)
+        super().__init__(identifier, mode, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -219,12 +219,12 @@ class ParameterVariableInterfaceItem(
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         mode: Mode,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression = None,
     ):
-        super().__init__(name, mode, subType, defaultExpression)
+        super().__init__(identifier, mode, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -250,12 +250,12 @@ class ParameterSignalInterfaceItem(VHDLModel_ParameterSignalInterfaceItem, DOMMi
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         mode: Mode,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression = None,
     ):
-        super().__init__(name, mode, subType, defaultExpression)
+        super().__init__(identifier, mode, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -281,10 +281,10 @@ class ParameterFileInterfaceItem(VHDLModel_ParameterFileInterfaceItem, DOMMixin)
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         subType: SubTypeOrSymbol,
     ):
-        super().__init__(name, subType)
+        super().__init__(identifier, subType)
         DOMMixin.__init__(self, node)
 
     @classmethod
diff --git a/pyGHDL/dom/Names.py b/pyGHDL/dom/Names.py
index fa53acae6..e09294d40 100644
--- a/pyGHDL/dom/Names.py
+++ b/pyGHDL/dom/Names.py
@@ -52,8 +52,8 @@ __all__ = []
 
 @export
 class SimpleName(VHDLModel_SimpleName, DOMMixin):
-    def __init__(self, node: Iir, name: str):
-        super().__init__(name)
+    def __init__(self, node: Iir, identifier: str):
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
 
@@ -66,29 +66,29 @@ class ParenthesisName(VHDLModel_ParenthesisName, DOMMixin):
 
 @export
 class IndexedName(VHDLModel_IndexedName, DOMMixin):
-    def __init__(self, node: Iir, name: str):
-        super().__init__(name)
+    def __init__(self, node: Iir, identifier: str):
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
 
 @export
 class SlicedName(VHDLModel_SlicedName, DOMMixin):
-    def __init__(self, node: Iir, name: str):
-        super().__init__(name)
+    def __init__(self, node: Iir, identifier: str):
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
 
 @export
 class SelectedName(VHDLModel_SelectedName, DOMMixin):
-    def __init__(self, node: Iir, name: str, prefix: Name):
-        super().__init__(name, prefix)
+    def __init__(self, node: Iir, identifier: str, prefix: Name):
+        super().__init__(identifier, prefix)
         DOMMixin.__init__(self, node)
 
 
 @export
 class AttributeName(VHDLModel_AttributeName, DOMMixin):
-    def __init__(self, node: Iir, name: str, prefix: Name):
-        super().__init__(name, prefix)
+    def __init__(self, node: Iir, identifier: str, prefix: Name):
+        super().__init__(identifier, prefix)
         DOMMixin.__init__(self, node)
 
 
diff --git a/pyGHDL/dom/Object.py b/pyGHDL/dom/Object.py
index 0358f716d..97bfdaa82 100644
--- a/pyGHDL/dom/Object.py
+++ b/pyGHDL/dom/Object.py
@@ -58,11 +58,11 @@ class Constant(VHDLModel_Constant, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression,
     ):
-        super().__init__(name, subType, defaultExpression)
+        super().__init__(identifier, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -85,8 +85,8 @@ class Constant(VHDLModel_Constant, DOMMixin):
 
 @export
 class DeferredConstant(VHDLModel_DeferredConstant, DOMMixin):
-    def __init__(self, node: Iir, name: str, subType: SubTypeOrSymbol):
-        super().__init__(name, subType)
+    def __init__(self, node: Iir, identifier: str, subType: SubTypeOrSymbol):
+        super().__init__(identifier, subType)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -106,11 +106,11 @@ class Variable(VHDLModel_Variable, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression,
     ):
-        super().__init__(name, subType, defaultExpression)
+        super().__init__(identifier, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -132,8 +132,8 @@ class Variable(VHDLModel_Variable, DOMMixin):
 
 @export
 class SharedVariable(VHDLModel_SharedVariable, DOMMixin):
-    def __init__(self, node: Iir, name: str, subType: SubTypeOrSymbol):
-        super().__init__(name, subType)
+    def __init__(self, node: Iir, identifier: str, subType: SubTypeOrSymbol):
+        super().__init__(identifier, subType)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -151,11 +151,11 @@ class Signal(VHDLModel_Signal, DOMMixin):
     def __init__(
         self,
         node: Iir,
-        name: str,
+        identifier: str,
         subType: SubTypeOrSymbol,
         defaultExpression: Expression,
     ):
-        super().__init__(name, subType, defaultExpression)
+        super().__init__(identifier, subType, defaultExpression)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -175,8 +175,8 @@ class Signal(VHDLModel_Signal, DOMMixin):
 
 @export
 class File(VHDLModel_File, DOMMixin):
-    def __init__(self, node: Iir, name: str, subType: SubTypeOrSymbol):
-        super().__init__(name, subType)
+    def __init__(self, node: Iir, identifier: str, subType: SubTypeOrSymbol):
+        super().__init__(identifier, subType)
         DOMMixin.__init__(self, node)
 
     @classmethod
diff --git a/pyGHDL/dom/Type.py b/pyGHDL/dom/Type.py
index ba774f079..ea4765ed1 100644
--- a/pyGHDL/dom/Type.py
+++ b/pyGHDL/dom/Type.py
@@ -62,8 +62,8 @@ from pyGHDL.dom.Subprogram import Function, Procedure
 
 @export
 class IncompleteType(VHDLModel_AnonymousType, DOMMixin):
-    def __init__(self, node: Iir, name: str):
-        super().__init__(name)
+    def __init__(self, node: Iir, identifier: str):
+        super().__init__(identifier)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -75,8 +75,8 @@ class IncompleteType(VHDLModel_AnonymousType, DOMMixin):
 
 @export
 class EnumeratedType(VHDLModel_EnumeratedType, DOMMixin):
-    def __init__(self, node: Iir, name: str, literals: List[EnumerationLiteral]):
-        super().__init__(name, literals)
+    def __init__(self, node: Iir, identifier: str, literals: List[EnumerationLiteral]):
+        super().__init__(identifier, literals)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -135,9 +135,9 @@ class PhysicalType(VHDLModel_PhysicalType, DOMMixin):
 @export
 class ArrayType(VHDLModel_ArrayType, DOMMixin):
     def __init__(
-        self, node: Iir, name: str, indices: List, elementSubType: SubTypeOrSymbol
+        self, node: Iir, identifier: str, indices: List, elementSubType: SubTypeOrSymbol
     ):
-        super().__init__(name, indices, elementSubType)
+        super().__init__(identifier, indices, elementSubType)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -173,8 +173,8 @@ class ArrayType(VHDLModel_ArrayType, DOMMixin):
 
 @export
 class RecordTypeElement(VHDLModel_RecordTypeElement, DOMMixin):
-    def __init__(self, node: Iir, name: str, subType: SubTypeOrSymbol):
-        super().__init__(name, subType)
+    def __init__(self, node: Iir, identifier: str, subType: SubTypeOrSymbol):
+        super().__init__(identifier, subType)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -191,8 +191,8 @@ class RecordTypeElement(VHDLModel_RecordTypeElement, DOMMixin):
 
 @export
 class RecordType(VHDLModel_RecordType, DOMMixin):
-    def __init__(self, node: Iir, name: str, elements: List[RecordTypeElement] = None):
-        super().__init__(name, elements)
+    def __init__(self, node: Iir, identifier: str, elements: List[RecordTypeElement] = None):
+        super().__init__(identifier, elements)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -208,8 +208,8 @@ class RecordType(VHDLModel_RecordType, DOMMixin):
 
 @export
 class ProtectedType(VHDLModel_ProtectedType, DOMMixin):
-    def __init__(self, node: Iir, name: str, methods: Union[List, Iterator] = None):
-        super().__init__(name, methods)
+    def __init__(self, node: Iir, identifier: str, methods: Union[List, Iterator] = None):
+        super().__init__(identifier, methods)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -229,9 +229,9 @@ class ProtectedType(VHDLModel_ProtectedType, DOMMixin):
 @export
 class ProtectedTypeBody(VHDLModel_ProtectedTypeBody, DOMMixin):
     def __init__(
-        self, node: Iir, name: str, declaredItems: Union[List, Iterator] = None
+        self, node: Iir, identifier: str, declaredItems: Union[List, Iterator] = None
     ):
-        super().__init__(name, declaredItems)
+        super().__init__(identifier, declaredItems)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -250,8 +250,8 @@ class ProtectedTypeBody(VHDLModel_ProtectedTypeBody, DOMMixin):
 
 @export
 class AccessType(VHDLModel_AccessType, DOMMixin):
-    def __init__(self, node: Iir, name: str, designatedSubType: SubTypeOrSymbol):
-        super().__init__(name, designatedSubType)
+    def __init__(self, node: Iir, identifier: str, designatedSubType: SubTypeOrSymbol):
+        super().__init__(identifier, designatedSubType)
         DOMMixin.__init__(self, node)
 
     @classmethod
@@ -270,8 +270,8 @@ class AccessType(VHDLModel_AccessType, DOMMixin):
 
 @export
 class FileType(VHDLModel_FileType, DOMMixin):
-    def __init__(self, node: Iir, name: str, designatedSubType: SubTypeOrSymbol):
-        super().__init__(name, designatedSubType)
+    def __init__(self, node: Iir, identifier: str, designatedSubType: SubTypeOrSymbol):
+        super().__init__(identifier, designatedSubType)
         DOMMixin.__init__(self, node)
 
     @classmethod
diff --git a/pyGHDL/dom/formatting/prettyprint.py b/pyGHDL/dom/formatting/prettyprint.py
index f7994b36d..98e17a5d0 100644
--- a/pyGHDL/dom/formatting/prettyprint.py
+++ b/pyGHDL/dom/formatting/prettyprint.py
@@ -160,7 +160,7 @@ class PrettyPrint:
         prefix = "  " * level
         buffer.append(
             "{prefix}- Name: {name} at {file}:{line}:{column}".format(
-                name=entity.Name,
+                name=entity.Identifier,
                 prefix=prefix,
                 file=entity.Position.Filename.name,
                 line=entity.Position.Line,
@@ -189,7 +189,7 @@ class PrettyPrint:
         prefix = "  " * level
         buffer.append(
             "{prefix}- Name: {name} at {file}:{line}:{column}".format(
-                name=architecture.Name,
+                name=architecture.Identifier,
                 prefix=prefix,
                 file=architecture.Position.Filename.name,
                 line=architecture.Position.Line,
@@ -212,7 +212,7 @@ class PrettyPrint:
         buffer = []
         prefix = "  " * level
         buffer.append(
-            "{prefix}- Component: {name}".format(name=component.Name, prefix=prefix)
+            "{prefix}- Component: {name}".format(name=component.Identifier, prefix=prefix)
         )
         buffer.append("{prefix}  Generics:".format(prefix=prefix))
         for generic in component.GenericItems:
@@ -228,7 +228,7 @@ class PrettyPrint:
     def formatPackage(self, package: Package, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=package.Name, prefix=prefix))
+        buffer.append("{prefix}- Name: {name}".format(name=package.Identifier, prefix=prefix))
         buffer.append("{prefix}  Declared:".format(prefix=prefix))
         for item in package.DeclaredItems:
             for line in self.formatDeclaredItems(item, level + 1):
@@ -241,7 +241,7 @@ class PrettyPrint:
     ) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=package.Name, prefix=prefix))
+        buffer.append("{prefix}- Name: {name}".format(name=package.Identifier, prefix=prefix))
         buffer.append(
             "{prefix}  Package: {name!s}".format(
                 prefix=prefix, name=package.PackageReference
@@ -260,7 +260,7 @@ class PrettyPrint:
         buffer = []
         prefix = "  " * level
         buffer.append(
-            "{prefix}- Name: {name}".format(name=packageBody.Name, prefix=prefix)
+            "{prefix}- Name: {name}".format(name=packageBody.Identifier, prefix=prefix)
         )
         buffer.append("{prefix}  Declared:".format(prefix=prefix))
         for item in packageBody.DeclaredItems:
@@ -275,7 +275,7 @@ class PrettyPrint:
         buffer = []
         prefix = "  " * level
         buffer.append(
-            "{prefix}- Name: {name}".format(name=configuration.Name, prefix=prefix)
+            "{prefix}- Name: {name}".format(name=configuration.Identifier, prefix=prefix)
         )
 
         return buffer
@@ -283,7 +283,7 @@ class PrettyPrint:
     def formatContext(self, context: Context, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=context.Name, prefix=prefix))
+        buffer.append("{prefix}- Name: {name}".format(name=context.Identifier, prefix=prefix))
 
         return buffer
 
@@ -296,7 +296,7 @@ class PrettyPrint:
             return self.formatGenericType(generic, level)
         else:
             raise PrettyPrintException(
-                "Unhandled generic kind for generic '{name}'.".format(name=generic.Name)
+                "Unhandled generic kind for generic '{name}'.".format(name=generic.Identifier)
             )
 
     def formatPort(
@@ -306,7 +306,7 @@ class PrettyPrint:
             return self.formatPortSignal(port, level)
         else:
             raise PrettyPrintException(
-                "Unhandled port kind for port '{name}'.".format(name=port.Name)
+                "Unhandled port kind for port '{name}'.".format(name=port.Identifier)
             )
 
     def formatGenericConstant(
@@ -318,10 +318,10 @@ class PrettyPrint:
         buffer.append(
             "{prefix}  - {name} : {mode!s} {subtypeindication}{initialValue}".format(
                 prefix=prefix,
-                name=generic.Name,
+                name=generic.Identifier,
                 mode=generic.Mode,
                 subtypeindication=self.formatSubtypeIndication(
-                    generic.SubType, "generic", generic.Name
+                    generic.SubType, "generic", generic.Identifier
                 ),
                 initialValue=self.formatInitialValue(generic),
             )
@@ -338,7 +338,7 @@ class PrettyPrint:
         buffer.append(
             "{prefix}  - type {name}".format(
                 prefix=prefix,
-                name=generic.Name,
+                name=generic.Identifier,
             )
         )
 
@@ -353,10 +353,10 @@ class PrettyPrint:
         buffer.append(
             "{prefix}  - {name} : {mode!s} {subtypeindication}{initialValue}".format(
                 prefix=prefix,
-                name=port.Name,
+                name=port.Identifier,
                 mode=port.Mode,
                 subtypeindication=self.formatSubtypeIndication(
-                    port.SubType, "port", port.Name
+                    port.SubType, "port", port.Identifier
                 ),
                 initialValue=self.formatInitialValue(port),
             )
@@ -372,9 +372,9 @@ class PrettyPrint:
             buffer.append(
                 "{prefix}- constant {name} : {subtype} := {expr}".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                     subtype=self.formatSubtypeIndication(
-                        item.SubType, "constant", item.Name
+                        item.SubType, "constant", item.Identifier
                     ),
                     expr=str(item.DefaultExpression),
                 )
@@ -383,9 +383,9 @@ class PrettyPrint:
             buffer.append(
                 "{prefix}- shared variable {name} : {subtype}".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                     subtype=self.formatSubtypeIndication(
-                        item.SubType, "shared variable", item.Name
+                        item.SubType, "shared variable", item.Identifier
                     ),
                 )
             )
@@ -393,9 +393,9 @@ class PrettyPrint:
             buffer.append(
                 "{prefix}- signal {name} : {subtype}{initValue}".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                     subtype=self.formatSubtypeIndication(
-                        item.SubType, "signal", item.Name
+                        item.SubType, "signal", item.Identifier
                     ),
                     initValue=" := {expr}".format(expr=str(item.DefaultExpression))
                     if item.DefaultExpression is not None
@@ -406,9 +406,9 @@ class PrettyPrint:
             buffer.append(
                 "{prefix}- File {name} : {subtype}".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                     subtype=self.formatSubtypeIndication(
-                        item.SubType, "file", item.Name
+                        item.SubType, "file", item.Identifier
                     ),
                 )
             )
@@ -420,27 +420,27 @@ class PrettyPrint:
             buffer.append(
                 "{prefix}- subtype {name} is ?????".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                 )
             )
         elif isinstance(item, Alias):
             buffer.append(
                 "{prefix}- alias {name} is ?????".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                 )
             )
         elif isinstance(item, Function):
             buffer.append(
                 "{prefix}- function {name} return {returnType!s}".format(
-                    prefix=prefix, name=item.Name, returnType=item.ReturnType
+                    prefix=prefix, name=item.Identifier, returnType=item.ReturnType
                 )
             )
         elif isinstance(item, Procedure):
             buffer.append(
                 "{prefix}- procedure {name}".format(
                     prefix=prefix,
-                    name=item.Name,
+                    name=item.Identifier,
                 )
             )
         elif isinstance(item, Component):
@@ -449,7 +449,7 @@ class PrettyPrint:
         elif isinstance(item, Attribute):
             buffer.append(
                 "{prefix}- attribute {name} : {type!s}".format(
-                    prefix=prefix, name=item.Name, type=item.SubType
+                    prefix=prefix, name=item.Identifier, type=item.SubType
                 )
             )
         elif isinstance(item, AttributeSpecification):
@@ -469,7 +469,7 @@ class PrettyPrint:
         elif isinstance(item, PackageInstantiation):
             buffer.append(
                 "{prefix}- package {name} is new {name2!s} generic map (.....)".format(
-                    prefix=prefix, name=item.Name, name2=item.PackageReference
+                    prefix=prefix, name=item.Identifier, name2=item.PackageReference
                 )
             )
         else:
@@ -482,7 +482,7 @@ class PrettyPrint:
         return buffer
 
     def formatType(self, item: BaseType) -> str:
-        result = "type {name} is ".format(name=item.Name)
+        result = "type {name} is ".format(name=item.Identifier)
         if isinstance(item, IncompleteType):
             result += ""
         elif isinstance(item, IntegerType):