Rename variables to match BFD