OP-1330 fix  namings/uncrustify