Some other places that needed to be renamed
I think this is the last of the renaming