Remove conflict between namespace and class name