These variables were renamed in 904276bb44caec207638247f23139bc21bc6a09e; update them to use the new names. Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry picked from commit 2ab8109be15a7739caa72ec8f863e8e01c2c9a0f)