fix some misnomers