update code and comments to reflect proper names