fixed state changing to use name setting