bugid-47810 use static class for namespacing