Refactoring the env names.

Signed-off-by: Markus Hubig <mhubig@gmail.com>