Fix more references to old context design

Created by  Jane Lusby  on March 5, 2020
7WGNUDSYDVWLON2ZGOWOEAFITUZGIWOYDPH24CTPT3LOPNYCW56QC
Change contents