NOREF: Correcting some naming problems with the monitor class