Replace components to those from new OSURC libraries.