Switch index names for consistency with mathetmatical notation