Rename Zvariant objects
Add WKH mask