Issue: #240 - Fixing class name bugs