Revert "Updated vocab namespace"

This reverts commit d99e112cffb6461db59f7eea642a46c52143ac61.

XXX: Temporarily holding this back until September