Fix: use right configuration name
Fix bad comment class name