removed all CV suffices from class names