Patch openbsc to use the moved and renamed functions