Better config var names

Change-Id: Iea911d047267a8db9e4601d6acc20a6f77e2d994