Update code according to libbp renaming.