rename something or other, fix a busted comment