From ff389057e2612f721791b6a5abc2e7289ce73e05 Mon Sep 17 00:00:00 2001
From: Haacked <haacked@gmail.com>
Date: Wed, 6 Nov 2013 09:00:29 -0800
Subject: [PATCH] Rename Event to Events to avoid keyword collision

---
 Octokit.Reactive/Clients/IObservableActivitiesClient.cs | 2 +-
 Octokit.Reactive/Clients/ObservableActivitiesClient.cs  | 4 ++--
 Octokit/Clients/ActivitiesClient.cs                     | 4 ++--
 Octokit/Clients/IActivitiesClient.cs                    | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
index f3e87650..b3698f33 100644
--- a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
@@ -2,6 +2,6 @@
 {
     public interface IObservableActivitiesClient
     {
-        IObservableEventsClient Event{ get; }
+        IObservableEventsClient Events { get; }
     }
 }
\ No newline at end of file
diff --git a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
index f5ee1f97..c2150c59 100644
--- a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
@@ -6,8 +6,8 @@
         {
             Ensure.ArgumentNotNull(client, "client");
 
-            Event = new ObservableEventsClient(client);
+            Events = new ObservableEventsClient(client);
         }
-        public IObservableEventsClient Event { get; private set; }
+        public IObservableEventsClient Events { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Octokit/Clients/ActivitiesClient.cs b/Octokit/Clients/ActivitiesClient.cs
index 8b47d9fa..ade4ac5d 100644
--- a/Octokit/Clients/ActivitiesClient.cs
+++ b/Octokit/Clients/ActivitiesClient.cs
@@ -5,9 +5,9 @@
         public ActivitiesClient(IApiConnection apiConnection)
             : base(apiConnection)
         {
-            Event = new EventsClient(apiConnection);
+            Events = new EventsClient(apiConnection);
         }
 
-        public IEventsClient Event { get; private set; }
+        public IEventsClient Events { get; private set; }
     }
 }
diff --git a/Octokit/Clients/IActivitiesClient.cs b/Octokit/Clients/IActivitiesClient.cs
index 8c4a0316..81c4f294 100644
--- a/Octokit/Clients/IActivitiesClient.cs
+++ b/Octokit/Clients/IActivitiesClient.cs
@@ -2,7 +2,6 @@
 {
     public interface IActivitiesClient
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Event")]
-        IEventsClient Event { get; }
+        IEventsClient Events { get; }
     }
 }
\ No newline at end of file