Class renames.  Cleaned up KeyWrappingExample