ID corrections

(This, for better or worse, realigns everything to use FTB-U IDs instead of the compromise attempt tried before.)