Added naming and grouping to entities.