Rename build functions for rtree.
On branch master