A bunch of renaming and changes to interfaces.