I think so.  I'll update with the name changes.