Refactor of bad variable name locations