Renamed entity and architecture ends