Refactoring: mainly rename ic_env_tvs to ic_untch