variable names are hard /cc @frankfarmer

(cherry picked from commit dd0b9b089f47cd97f5aa3f022ade4778d6efa0fb)