name fixes, to split up and squash
3 files changed