Fix various small issues related with class names to pass tests.