Gave more descriptive class and namespace names.  Eliminated warnings.
Gave more descriptive class and namespace names.  Eliminated warnings.