Workstation name collision

Hi

Found out that quite a few workstations were not registered after we updated to zen4 from zen3.2 and some registered with the wrong name probably due to ghost.
My fix was to add the following to the login script:
zwreg -unreg
zwsreg -importserver (server name for that location)

for the most part that has worked well but I see some odd PC names where it there will be a 1 or 2 after a PC name that exists.

PCnew
PCnew1

How can I avoid that? And do I just delete the PC with the 1 after it to fix the issue?

Thanks,

Will