more fixes for DataExchangeFormat rename