Name refactoring and cleanup.