CSTL-945 - add data-name and Id attributes