Cleaning up code.
Rename some interfaces for consistency.