Fix issue with Service Name and Added Tool Help.