Fixed merge mistake during rebase.

And use the old-new MvxPlugins namespace too.