Fixes variable name problems.