function variants names changed to 2D, 3D