Better name cleanup for XXX and PC groups, when predb and NFO's are not otherwise used.

These changes do nothing until connected to the backend however