Renumber request types in 1.6.