Rename the variable to match rest of codebase while here. This is related to
bug 2295, although snprintf() protects against buffer overflow in 15.08 and up.