Change AWS env variables to their canonical name (thx Zvi)