Fixed index naming