Refactored the names

I have no idea why the merges are like this.

I've tried the rebase and squash methods, but this was the end result.