Rename classe. Move common operation to new class