fixed more misnaming issues in the state classes