Change 'hsi' to 'Hop storage index' on new hop fields