Renamed RollContext to FrameContext and vice versa