Clean up the provenance and naming