Doing some renaming to better match Rhino conventions.