Small changes to naming strategies and upload systems