Update env_namespace to use soap instead of env