redefine default variables to increase visibility

Change-Id: Ia854fff56babc1bd50bb7b9e5eea54df68a581b3
2 files changed