Really rename
Add WG draft