CKLOG-1109] Updated the element ids to conform to naming convention