Fixed incorrect index numbers and names.