Step 3 of renaming ...

Everything is currently functional (but messy)