Renaming MasterContextMixin to MasterMixin