[CLC-2111] Verb -> Noun renaming