Fixed #383 for renaming labels