Adjust naming of S3 ENV