Also simplified the name to GUID conversion code, and improved the comments. Signed-off-by: Kevin Parsons <kevpar@microsoft.com>