added trailing identifiers for entity, architecture, process