Update to use latest variable name changes