Rename state to status