Added in label renaming support