Refactor change variable naming