Recind changes to settings and class member names