Put category and data series names into the shape collection.

Their positions are yet to be calculated.

Change-Id: Ibb1f2498eb2af3305c2afb6d41be99eaf279daaf