Rename according to new tracking