Merge "Updating ENV var names to better reflect what they point to"