Rename classes some more.
Remove user agent from launcher.