Further search and replace for moved modules.