Removed silly CHFile class member naming convention, added 2 REs