Added trailing identifiers to entities, architectures and processes