RF: corrected class names