More cosmetic changes, GUID -> Guid