Finally corrected all index names.