Fix wrong variable names resulting from backport.