class names refactoring accroding to class prefix