Further search and replace fixes 6->5