bugs fixed for class name