Merge "Fix up inconsistent variable names." into nyc-mr1-dev