fix a few naming things