Rewrite vocabulary spec to use meta term factory