Updated the macro variable naming