Some renaming and name changing

Absolutely nothing is going to work right now.