It occurred to me you've been doing this the hard way. You should probably go through this list since at least the high count ones should get aliases, the low counts can probably be safely moved by hand (I would do it but effort and busy with other things.)