Repair matrix expansion and rename stages
Repair matrix expansion and rename stages

bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop