Open Zbrush first and go to Preferences > GoZ and click Clear Cache Files. The next time you GoZ from CC3 the subtools will not have (1), (2), etc after the names.
Clicking GoZ All will now map the correct meshes back in CC3.
So always clear the cache before starting a new project.