OP-1312 fix copy/paste-naming issue