System names in the EndpointQueues files

Does anyone know if the files in the sub-folders of
C:\WINDOWS\system32\CCM\ServiceData\Messaging\Endp ointQueues\ should 'only'
contain the current system name? I have found some systems that appear to
have been deployed using an image that included the SMS client and the
endpointqueue files contain some entries listing previous system names.
Some, but not all, of these systems show errors in the PolicyAgent log where
the WMI namespace is on another system (that corresponds to what is listed in
the endpointqueues files).

I'm thinking of uninstalling and repushing the client to these systems to
get them cleaned up.

Dan