rename & break in 2 classes cf. above