[demo] Fix sorting of changesets, make renames atomic

Closes #40