Name fixes

Things copied over from the previous file didn’t have the right names.
Still have to clean up code - thinking about making another module to
help out with some nasty bits.