I'm not as concerned about WF, but we need to be careful about changing id's if this will be merged into EAP. I realize there aren't many and these do overlap, but just putting it out there more than anything.