fixing a bunch of spots where index names were hard-coded instead of using the constants we already had