AbstractEllipse renamed to AbstractGeometry