More renaming to match library name.  Fix linker failure for env target.