Renaming sample references, part 2.