WK-760 removed 'Mws' in class names