rename states in conductor to be less confusing