More work on consistent naming.
Remove unused code.
Event more renaming for consistency.