Update old mapState references