Improvments in class name