VID-1364 Actually fix the numbers on method names