FP-145: reorganized vocabs
FP-145: doc updated