Fixed namespace and class name issue