actually fix env lookup names