adapt dispatch refactoring for standard namespace