ENV vars: improve source consistency (variable naming, etc.).

ENV vars: improve source consistency (variable naming, etc.).