LPS-46366 Use the new constants in the indexers affected