Fixing namespaces for S3