Used more consistent variable names in Index classes