change elements naming

as per our conversation today