Wi-Fi branding to get a lot simpler with upcoming “Wi-Fi 6”