rename stuff.  change header comments.