Renaming a few more pieces to be bones_rpc specific.