Small cleanups.  Update string constant names.