Rename some more stateinfo attrs