Revert "Updated vocab namespace"

This reverts commit 18c0416dee9747db89291e7e7b1b8f7cdc8d4e44.

XXX: Temporarily holding this back until September and
the new PATExpert namespace is sorted out.