Remove obsolete name parameter in UFC
Refactor lexicon: extract regexp strings from methods. Needed for CRAB3
Merge pull request #5039 from mmascher/master

Remove obsolete name parameter in UFC