[mr2905] More cosmetic changes, GUID -> Guid