Fix namespace to detect class name simply
Fix indent