changed comments to use both names