BS-10411 very last part of attribute name refactor