Properly Rename Element value