re-organize changeset numbering, and fix naming
corresponding change to d2rq mapping