Fixed some naming and reset