fix some of the misnomers