Some renaming and cleanup.