Fluid 5076: More renaming to synchronize UIO component names.