Renaming TDT -> USD relations (first round, will need to do more) + fixing 'None'