Merge "Update reordering method names, and make 3d reordering API public"