Update comments to reflect changes in names