Fix broken test cases because variable renaming
Renaming identifiers in array indexing in CBN
Merge pull request #1379 from ke-yu/ChocoButter-2Become1

Fix broken test cases because of variable renaming in CBN