More fixes to tool template names