Fix names and index