Update env variable names so they can be more organized.