[TASK] Update vhs 2.0 namespaces
Merge pull request #583 from xf-/vhs-namespaces-update

[TASK] Update vhs 2.0 namespaces