Make variable names for protocol GUIDs consistent