Merge "x/ref: Merge naming.{VDL,}{MountEntry,MountedServer,Glob}."