Renamed USI-DO and USI-DI to USI_DO and USI_DI