Refactoring of operation class names