Rename S7... models to S6... (Energy2D)

[#71755532]
[#81005074]