[NUCCORE-1192] Commonise method names