TRIVIAL: Rename Misnomers