South Africa-Boer Republics

Just noticed that in SA-Boer Republics, the first three 'sections'- Cape of Good Hope, and the two Griqua Town sections are included under the 'country' of Boer Republics.

Wouldn't it make more sense to put them in South Africa proper? As Boer Republics refers only to the Dutch settler states (Transvaal, Orange Free State, etc) and those three were British Possessions.

There is already request for renaming Boer Republics to South Africa - Pre Union. That would solve the issue.