These changes look fine. We just need to decide if we want to change everything that's ibv_* to rdma_*, or keep IB specific names (path records, GIDs, PKeys, etc.) the same. - Sean