Update and rename classes and operators to operator classes