VE-1024: Changing Toolgroup to ToolGroup