Name change & small changes to sctx