AreaCircle -> Circle ?
AreaPolygon -> Polygon ?

Maybe a matter of taste... ;)