Switch to more consistent indices' naming.