Cleaning up context variable names