Get unnamed and named terms working with new env