Modify class positions and names