Update makeenv to use user-specified env name EVERYWHERE