Made more distinction between entities and aggregates in namespaces