Settled on a naming convention and new uploads.