Renamed Toolkit > ToolkitSchema for consistency.