fixes

class names fixes