lots of fidgety work to get track renaming to work correctly now that we have to...