Fixing more namespacing in S3.