Rename element id to be consistance with new text