Minor cleanup items found during rename work

I've probably made a few faux pas here