Cleanup environment variables.

Renamed variables to more descriptive names and
removed unused ones.

Fixes #976.

Change-Id: I0c17443c93efe581bf728f783893181e5a7f8ed8