Rename CompositePrimitive to PrimitiveCollection