The name surface is really overloaded when dealing with wayland windows. To alleviate ambiguity, this commit changes the name of the "surface" and "subsurface" members to have a wl_ prefix. https://bugzilla.gnome.org/show_bug.cgi?id=761312