More name fixes, wasn't supposed to be a PR