Fix naming of body indexes