Added renaming support for labels