Rename 'state' presence key to the much more obvious 'presence'; maintain a legacy 'state' copy for now