Rename everything!

:dolphin:
For real this time.