Use new variable names
Revert "wrong variable"

This reverts commit db722dbcba760f19a98d125d9f141e7a91a380fe.