[UIML] Use generic vocabulary
Merge remote-tracking branch 'origin/master'