[master 1/1] Change the generated API indices slightly