Rename some traits to be less stupid.
Rename.
Fix a few imports.