restructuring after the toolkit name changes.