Adding renaming for some env vars

Need to remove the pointless code at some point