rename some kind, changed some piechart attributes