Change the Namespacing to reflect current prefixes

We no longer use `x-` for namespacing any of our classes