updated a few comments to reflect renamed classes that I messed when I did the renaming