Fixing issue #926 -- stringy fixes. Mostly branding issues.

Fixes in a number of files.