Updating naming for index