Adding context and name to envs.