Fix a few wrong variable names in the last MR< which didn't show up due to the understood (?) import failure before these lines were encountered.