Renamed GroupChoice to GroupMatrixChoice
Renamed GroupChoice to GroupMatrixChoice