Fix naming of events.

We no longer need to be consistent with the odd casing/naming
of actions.

res/com/dmdirc/ui/messages/format.yml

@@ -15,19 +15,19 @@ ChannelSelfMessageEvent:
 ChannelSelfActionEvent:
   format: "* {{client.modePrefixedNickname}} {{message}}"
   colour: 6
-ChannelGottopicEvent:
+ChannelGotTopicEvent:
   format: "* The topic for {{channel.name}} is '{{topic.topic}}'.\n* Topic was set by {{user.nickname}} at {{topic.time}}."
   colour: 3
 ChannelTopicChangeEvent:
   format: "* {{user.nickname}} has changed the topic to  {{topic.topic}}."
   colour: 3
-ChannelNotopicEvent:
+ChannelNoTopicEvent:
   format: "* There is no topic set for {{channel.name}}."
   colour: 3
 ChannelTopicUnsetEvent:
   format: "* {{client.modePrefixedNickname}} has removed the topic on {{channel.name}}."
   colour: 3
-ChannelModechangeEvent:
+ChannelModeChangeEvent:
   format: "* {{client.modePrefixedNickname}} sets mode: {{modes}}."
   colour: 3
 ChannelSelfModeChangeEvent:

src/com/dmdirc/ChannelEventHandler.java

@@ -24,18 +24,18 @@ package com.dmdirc;
 
 import com.dmdirc.events.ChannelActionEvent;
 import com.dmdirc.events.ChannelCtcpEvent;
-import com.dmdirc.events.ChannelGotnamesEvent;
-import com.dmdirc.events.ChannelGottopicEvent;
+import com.dmdirc.events.ChannelGotNamesEvent;
+import com.dmdirc.events.ChannelGotTopicEvent;
 import com.dmdirc.events.ChannelJoinEvent;
 import com.dmdirc.events.ChannelKickEvent;
-import com.dmdirc.events.ChannelListmodesretrievedEvent;
+import com.dmdirc.events.ChannelListModesRetrievedEvent;
 import com.dmdirc.events.ChannelMessageEvent;
 import com.dmdirc.events.ChannelModeNoticeEvent;
-import com.dmdirc.events.ChannelModechangeEvent;
-import com.dmdirc.events.ChannelModesdiscoveredEvent;
-import com.dmdirc.events.ChannelNickchangeEvent;
+import com.dmdirc.events.ChannelModeChangeEvent;
+import com.dmdirc.events.ChannelModesDiscoveredEvent;
+import com.dmdirc.events.ChannelNickChangeEvent;
 import com.dmdirc.events.ChannelNoticeEvent;
-import com.dmdirc.events.ChannelNotopicEvent;
+import com.dmdirc.events.ChannelNoTopicEvent;
 import com.dmdirc.events.ChannelPartEvent;
 import com.dmdirc.events.ChannelQuitEvent;
 import com.dmdirc.events.ChannelSelfModeChangeEvent;
@@ -44,7 +44,7 @@ import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.ChannelUserEvent;
-import com.dmdirc.events.ChannelUsermodechangeEvent;
+import com.dmdirc.events.ChannelUserModeChangeEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.parser.common.AwayState;
@@ -153,7 +153,7 @@ public class ChannelEventHandler extends EventHandler implements
         owner.setClients(channel.getChannelClients().stream()
                 .map(client -> groupChatUserManager.getUserFromClient(client, owner))
                 .collect(Collectors.toList()));
-        eventBus.publishAsync(new ChannelGotnamesEvent(date.getTime(), owner));
+        eventBus.publishAsync(new ChannelGotNamesEvent(date.getTime(), owner));
     }
 
     @Override
@@ -167,9 +167,9 @@ public class ChannelEventHandler extends EventHandler implements
 
         if (isJoinTopic) {
             if (Strings.isNullOrEmpty(channel.getTopic())) {
-                eventBus.publishAsync(new ChannelNotopicEvent(owner));
+                eventBus.publishAsync(new ChannelNoTopicEvent(owner));
             } else {
-                eventBus.publishAsync(new ChannelGottopicEvent(owner, topic,
+                eventBus.publishAsync(new ChannelGotTopicEvent(owner, topic,
                         owner.getConnection().get().getUser(channel.getTopicSetter())));
             }
         } else {
@@ -268,7 +268,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
         checkParser(parser);
 
-        final ChannelNickchangeEvent event = new ChannelNickchangeEvent(date.getTime(), owner,
+        final ChannelNickChangeEvent event = new ChannelNickChangeEvent(date.getTime(), owner,
                 groupChatUserManager.getUserFromClient(client, owner), oldNick);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfNickChange" : "channelNickChange");
@@ -285,7 +285,7 @@ public class ChannelEventHandler extends EventHandler implements
         if (!owner.getConfigManager().getOptionBool("channel", "splitusermodes")
                 || !owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
             if (host.isEmpty()) {
-                final ChannelModesdiscoveredEvent event = new ChannelModesdiscoveredEvent(
+                final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
                         date.getTime(), owner, modes.length() <= 1 ? "" : modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
@@ -294,7 +294,7 @@ public class ChannelEventHandler extends EventHandler implements
                 eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
                         groupChatUserManager.getUserFromClient(client, owner), modes));
             } else {
-                eventBus.publishAsync(new ChannelModechangeEvent(date.getTime(), owner,
+                eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
                         groupChatUserManager.getUserFromClient(client, owner), modes));
             }
         }
@@ -315,7 +315,7 @@ public class ChannelEventHandler extends EventHandler implements
                 format = "channelSplitUserMode_default";
             }
 
-            final ChannelUsermodechangeEvent event = new ChannelUsermodechangeEvent(date.getTime(),
+            final ChannelUserModeChangeEvent event = new ChannelUserModeChangeEvent(date.getTime(),
                     owner, groupChatUserManager.getUserFromClient(client, owner),
                     groupChatUserManager.getUserFromClient(targetClient, owner), mode);
             final String result = EventUtils.postDisplayable(eventBus, event, format);
@@ -381,7 +381,7 @@ public class ChannelEventHandler extends EventHandler implements
         if (owner.getConfigManager().getOptionBool("channel", "splitusermodes")
                 && owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
             if (host.isEmpty()) {
-                final ChannelModesdiscoveredEvent event = new ChannelModesdiscoveredEvent(
+                final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
                         date.getTime(), owner, modes.length() <= 1 ? "" : modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
@@ -390,7 +390,7 @@ public class ChannelEventHandler extends EventHandler implements
                 eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
                         groupChatUserManager.getUserFromClient(client, owner), modes));
             } else {
-                eventBus.publishAsync(new ChannelModechangeEvent(date.getTime(), owner,
+                eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
                         groupChatUserManager.getUserFromClient(client, owner), modes));
             }
         }
@@ -415,7 +415,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final char mode) {
         checkParser(parser);
 
-        final ChannelListmodesretrievedEvent event = new ChannelListmodesretrievedEvent(
+        final ChannelListModesRetrievedEvent event = new ChannelListModesRetrievedEvent(
                 date.getTime(), owner, mode);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelListModeRetrieved");

src/com/dmdirc/Query.java

@@ -28,7 +28,7 @@ import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryMessageEvent;
-import com.dmdirc.events.QueryNickchangeEvent;
+import com.dmdirc.events.QueryNickChangeEvent;
 import com.dmdirc.events.QueryQuitEvent;
 import com.dmdirc.events.QuerySelfActionEvent;
 import com.dmdirc.events.QuerySelfMessageEvent;
@@ -234,7 +234,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             }
 
             final String format = EventUtils.postDisplayable(getEventBus(),
-                    new QueryNickchangeEvent(this, oldNick),
+                    new QueryNickChangeEvent(this, oldNick),
                     "queryNickChanged");
 
             server.updateQuery(this, oldNick, client.getNickname());

src/com/dmdirc/ServerEventHandler.java

@@ -25,27 +25,27 @@ package com.dmdirc;
 import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.QuerySelfActionEvent;
 import com.dmdirc.events.QuerySelfMessageEvent;
-import com.dmdirc.events.ServerAuthnoticeEvent;
+import com.dmdirc.events.ServerAuthNoticeEvent;
 import com.dmdirc.events.ServerAwayEvent;
 import com.dmdirc.events.ServerBackEvent;
 import com.dmdirc.events.ServerCtcpEvent;
-import com.dmdirc.events.ServerCtcprEvent;
+import com.dmdirc.events.ServerCtcpReplyEvent;
 import com.dmdirc.events.ServerErrorEvent;
-import com.dmdirc.events.ServerGotpingEvent;
+import com.dmdirc.events.ServerGotPingEvent;
 import com.dmdirc.events.ServerInviteReceivedEvent;
-import com.dmdirc.events.ServerMotdendEvent;
-import com.dmdirc.events.ServerMotdlineEvent;
-import com.dmdirc.events.ServerMotdstartEvent;
-import com.dmdirc.events.ServerNickchangeEvent;
-import com.dmdirc.events.ServerNopingEvent;
+import com.dmdirc.events.ServerMotdEndEvent;
+import com.dmdirc.events.ServerMotdLineEvent;
+import com.dmdirc.events.ServerMotdStartEvent;
+import com.dmdirc.events.ServerNickChangeEvent;
+import com.dmdirc.events.ServerNoPingEvent;
 import com.dmdirc.events.ServerNoticeEvent;
 import com.dmdirc.events.ServerNumericEvent;
-import com.dmdirc.events.ServerPingsentEvent;
-import com.dmdirc.events.ServerServernoticeEvent;
-import com.dmdirc.events.ServerUnknownactionEvent;
-import com.dmdirc.events.ServerUnknownmessageEvent;
-import com.dmdirc.events.ServerUnknownnoticeEvent;
-import com.dmdirc.events.ServerUsermodesEvent;
+import com.dmdirc.events.ServerPingSentEvent;
+import com.dmdirc.events.ServerServerNoticeEvent;
+import com.dmdirc.events.ServerUnknownActionEvent;
+import com.dmdirc.events.ServerUnknownMessageEvent;
+import com.dmdirc.events.ServerUnknownNoticeEvent;
+import com.dmdirc.events.ServerUserModesEvent;
 import com.dmdirc.events.ServerWalldesyncEvent;
 import com.dmdirc.events.ServerWallopsEvent;
 import com.dmdirc.events.ServerWallusersEvent;
@@ -228,7 +228,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ServerCtcprEvent event = new ServerCtcprEvent(owner, owner.getUser(host),
+        final ServerCtcpReplyEvent event = new ServerCtcpReplyEvent(owner, owner.getUser(host),
                 type, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "privateCTCPreply");
         owner.doNotification(format, owner.getUser(host), type, message);
@@ -257,7 +257,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ServerServernoticeEvent event = new ServerServernoticeEvent(owner,
+        final ServerServerNoticeEvent event = new ServerServerNoticeEvent(owner,
                 owner.getLocalUser().get(), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "serverNotice");
         owner.doNotification(format, owner.getUser(host), message);
@@ -267,7 +267,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onMOTDStart(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        final ServerMotdstartEvent event = new ServerMotdstartEvent(owner, data);
+        final ServerMotdStartEvent event = new ServerMotdStartEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "motdStart");
         owner.doNotification(format, data);
     }
@@ -276,7 +276,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onMOTDLine(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        final ServerMotdlineEvent event = new ServerMotdlineEvent(owner, data);
+        final ServerMotdLineEvent event = new ServerMotdLineEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "motdLine");
         owner.doNotification(format, data);
     }
@@ -286,7 +286,7 @@ public class ServerEventHandler extends EventHandler implements
             final boolean noMOTD, final String data) {
         checkParser(parser);
 
-        final ServerMotdendEvent event = new ServerMotdendEvent(owner, data);
+        final ServerMotdEndEvent event = new ServerMotdEndEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "motdEnd");
         owner.doNotification(format, data);
     }
@@ -327,7 +327,7 @@ public class ServerEventHandler extends EventHandler implements
                         (int) Math.floor(parser.getPingTime() / 1000.0) + " seconds.",
                 owner.getConfigManager())));
 
-        eventBus.publishAsync(new ServerNopingEvent(owner, parser.getPingTime()));
+        eventBus.publishAsync(new ServerNoPingEvent(owner, parser.getPingTime()));
 
         if (parser.getPingTime()
                 >= owner.getConfigManager().getOptionInt("server", "pingtimeout")) {
@@ -341,14 +341,14 @@ public class ServerEventHandler extends EventHandler implements
     public void onPingSent(final Parser parser, final Date date) {
         checkParser(parser);
 
-        eventBus.publishAsync(new ServerPingsentEvent(owner));
+        eventBus.publishAsync(new ServerPingSentEvent(owner));
     }
 
     @Override
     public void onPingSuccess(final Parser parser, final Date date) {
         checkParser(parser);
 
-        eventBus.publishAsync(new ServerGotpingEvent(owner,
+        eventBus.publishAsync(new ServerGotPingEvent(owner,
                 owner.getParser().get().getServerLatency()));
     }
 
@@ -422,7 +422,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onNoticeAuth(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        final ServerAuthnoticeEvent event = new ServerAuthnoticeEvent(owner, data);
+        final ServerAuthNoticeEvent event = new ServerAuthNoticeEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "authNotice");
         owner.doNotification(format, data);
     }
@@ -432,7 +432,8 @@ public class ServerEventHandler extends EventHandler implements
             final String target, final String host) {
         checkParser(parser);
 
-        final ServerUnknownnoticeEvent event = new ServerUnknownnoticeEvent(owner, host, target, message);
+        final ServerUnknownNoticeEvent
+                event = new ServerUnknownNoticeEvent(owner, host, target, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "unknownNotice");
         owner.doNotification(format, host, target, message);
     }
@@ -450,8 +451,8 @@ public class ServerEventHandler extends EventHandler implements
                     "querySelfExternalMessage");
             owner.getQuery(target).doNotification(format, owner.getLocalUser(), message);
         } else {
-            final ServerUnknownmessageEvent event
-                    = new ServerUnknownmessageEvent(owner, host, target, message);
+            final ServerUnknownMessageEvent event
+                    = new ServerUnknownMessageEvent(owner, host, target, message);
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownMessage");
             owner.doNotification(format, host, target, message);
         }
@@ -470,8 +471,8 @@ public class ServerEventHandler extends EventHandler implements
                     "querySelfExternalAction");
             owner.getQuery(target).doNotification(format, owner.getLocalUser(), message);
         } else {
-            final ServerUnknownactionEvent event
-                    = new ServerUnknownactionEvent(owner, host, target, message);
+            final ServerUnknownActionEvent event
+                    = new ServerUnknownActionEvent(owner, host, target, message);
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownAction");
             owner.doNotification(format, host, target, message);
         }
@@ -482,7 +483,7 @@ public class ServerEventHandler extends EventHandler implements
             final ClientInfo client, final String host, final String modes) {
         checkParser(parser);
 
-        final ServerUsermodesEvent event = new ServerUsermodesEvent(owner,
+        final ServerUserModesEvent event = new ServerUserModesEvent(owner,
                 owner.getUser(client.getHostname()), modes);
         final String format = EventUtils.postDisplayable(eventBus, event, "userModeChanged");
         owner.doNotification(format, owner.getUser(client.getHostname()), modes);
@@ -493,7 +494,7 @@ public class ServerEventHandler extends EventHandler implements
             final ClientInfo client, final String modes) {
         checkParser(parser);
 
-        final ServerUsermodesEvent event = new ServerUsermodesEvent(owner,
+        final ServerUserModesEvent event = new ServerUserModesEvent(owner,
                 owner.getUser(client.getHostname()), modes);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 modes.isEmpty() || "+".equals(modes) ? "userNoModes" : "userModeDiscovered");
@@ -552,7 +553,7 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         if (client.equals(owner.getParser().get().getLocalClient())) {
-            final ServerNickchangeEvent event = new ServerNickchangeEvent(owner, oldNick,
+            final ServerNickChangeEvent event = new ServerNickChangeEvent(owner, oldNick,
                     client.getNickname());
             final String format = EventUtils.postDisplayable(eventBus, event, "selfNickChange");
             owner.doNotification(format, oldNick, client.getNickname());

src/com/dmdirc/events/ChannelGotnamesEvent.java → src/com/dmdirc/events/ChannelGotNamesEvent.java

@@ -27,13 +27,13 @@ import com.dmdirc.Channel;
 /**
  * Fired when a channel names event is received.
  */
-public class ChannelGotnamesEvent extends ChannelEvent {
+public class ChannelGotNamesEvent extends ChannelEvent {
 
-    public ChannelGotnamesEvent(final long timestamp, final Channel channel) {
+    public ChannelGotNamesEvent(final long timestamp, final Channel channel) {
         super(timestamp, channel);
     }
 
-    public ChannelGotnamesEvent(final Channel channel) {
+    public ChannelGotNamesEvent(final Channel channel) {
         super(channel);
     }
 

src/com/dmdirc/events/ChannelGottopicEvent.java → src/com/dmdirc/events/ChannelGotTopicEvent.java

@@ -29,20 +29,19 @@ import com.dmdirc.interfaces.User;
 /**
  * Fired when a channel topic is changed.
  */
-public class ChannelGottopicEvent extends ChannelDisplayableEvent {
+public class ChannelGotTopicEvent extends ChannelDisplayableEvent {
 
     private final Topic topic;
     private final User user;
 
-    public ChannelGottopicEvent(final long timestamp, final Channel channel, final Topic topic,
+    public ChannelGotTopicEvent(final long timestamp, final Channel channel, final Topic topic,
             final User user) {
         super(timestamp, channel);
         this.topic = topic;
         this.user = user;
     }
 
-    public ChannelGottopicEvent(final Channel channel, final Topic topic,
-            final User user) {
+    public ChannelGotTopicEvent(final Channel channel, final Topic topic, final User user) {
         super(channel);
         this.topic = topic;
         this.user = user;

src/com/dmdirc/events/ChannelListmodesretrievedEvent.java → src/com/dmdirc/events/ChannelListModesRetrievedEvent.java

@@ -27,17 +27,17 @@ import com.dmdirc.Channel;
 /**
  * Fired when channel list modes are retrieved.
  */
-public class ChannelListmodesretrievedEvent extends ChannelDisplayableEvent {
+public class ChannelListModesRetrievedEvent extends ChannelDisplayableEvent {
 
     private final char mode;
 
-    public ChannelListmodesretrievedEvent(final long timestamp, final Channel channel,
+    public ChannelListModesRetrievedEvent(final long timestamp, final Channel channel,
             final char mode) {
         super(timestamp, channel);
         this.mode = mode;
     }
 
-    public ChannelListmodesretrievedEvent(final Channel channel, final char mode) {
+    public ChannelListModesRetrievedEvent(final Channel channel, final char mode) {
         super(channel);
         this.mode = mode;
     }

src/com/dmdirc/events/ChannelModechangeEvent.java → src/com/dmdirc/events/ChannelModeChangeEvent.java

@@ -28,20 +28,20 @@ import com.dmdirc.interfaces.GroupChatUser;
 /**
  * Fired when a channel mode is changed.
  */
-public class ChannelModechangeEvent extends ChannelDisplayableEvent {
+public class ChannelModeChangeEvent extends ChannelDisplayableEvent {
 
     private final GroupChatUser client;
     private final String modes;
 
-    public ChannelModechangeEvent(final long timestamp, final Channel channel,
+    public ChannelModeChangeEvent(final long timestamp, final Channel channel,
             final GroupChatUser client, final String modes) {
         super(timestamp, channel);
         this.client = client;
         this.modes = modes;
     }
 
-    public ChannelModechangeEvent(final Channel channel,
-            final GroupChatUser client, final String modes) {
+    public ChannelModeChangeEvent(final Channel channel, final GroupChatUser client,
+            final String modes) {
         super(channel);
         this.client = client;
         this.modes = modes;

src/com/dmdirc/events/ChannelModesdiscoveredEvent.java → src/com/dmdirc/events/ChannelModesDiscoveredEvent.java

@@ -27,17 +27,17 @@ import com.dmdirc.Channel;
 /**
  * Fired when channel modes are discovered.
  */
-public class ChannelModesdiscoveredEvent extends ChannelDisplayableEvent {
+public class ChannelModesDiscoveredEvent extends ChannelDisplayableEvent {
 
     private final String modes;
 
-    public ChannelModesdiscoveredEvent(final long timestamp, final Channel channel,
+    public ChannelModesDiscoveredEvent(final long timestamp, final Channel channel,
             final String modes) {
         super(timestamp, channel);
         this.modes = modes;
     }
 
-    public ChannelModesdiscoveredEvent(final Channel channel, final String modes) {
+    public ChannelModesDiscoveredEvent(final Channel channel, final String modes) {
         super(channel);
         this.modes = modes;
     }

src/com/dmdirc/events/ChannelNickchangeEvent.java → src/com/dmdirc/events/ChannelNickChangeEvent.java

@@ -28,19 +28,19 @@ import com.dmdirc.interfaces.GroupChatUser;
 /**
  * Fired when a user changes nickname in a channel.
  */
-public class ChannelNickchangeEvent extends ChannelDisplayableEvent {
+public class ChannelNickChangeEvent extends ChannelDisplayableEvent {
 
     private final GroupChatUser client;
     private final String oldNick;
 
-    public ChannelNickchangeEvent(final long timestamp, final Channel channel,
+    public ChannelNickChangeEvent(final long timestamp, final Channel channel,
             final GroupChatUser client, final String oldNick) {
         super(timestamp, channel);
         this.client = client;
         this.oldNick = oldNick;
     }
 
-    public ChannelNickchangeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelNickChangeEvent(final Channel channel, final GroupChatUser client,
             final String oldNick) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelNotopicEvent.java → src/com/dmdirc/events/ChannelNoTopicEvent.java

@@ -27,13 +27,13 @@ import com.dmdirc.Channel;
 /**
  * Fired when a topic is unset on a channel.
  */
-public class ChannelNotopicEvent extends ChannelDisplayableEvent {
+public class ChannelNoTopicEvent extends ChannelDisplayableEvent {
 
-    public ChannelNotopicEvent(final long timestamp, final Channel channel) {
+    public ChannelNoTopicEvent(final long timestamp, final Channel channel) {
         super(timestamp, channel);
     }
 
-    public ChannelNotopicEvent(final Channel channel) {
+    public ChannelNoTopicEvent(final Channel channel) {
         super(channel);
     }
 

src/com/dmdirc/events/ChannelSelfModeChangeEvent.java

@@ -28,7 +28,7 @@ import com.dmdirc.interfaces.GroupChatUser;
 /**
  * Event raised when the local client changes a channel mode.
  */
-public class ChannelSelfModeChangeEvent extends ChannelModechangeEvent {
+public class ChannelSelfModeChangeEvent extends ChannelModeChangeEvent {
 
     public ChannelSelfModeChangeEvent(final long timestamp, final Channel channel,
             final GroupChatUser client, final String modes) {

src/com/dmdirc/events/ChannelUsermodechangeEvent.java → src/com/dmdirc/events/ChannelUserModeChangeEvent.java

@@ -28,13 +28,13 @@ import com.dmdirc.interfaces.GroupChatUser;
 /**
  * Fired when a channel user mode change occurs.
  */
-public class ChannelUsermodechangeEvent extends ChannelDisplayableEvent {
+public class ChannelUserModeChangeEvent extends ChannelDisplayableEvent {
 
     private final GroupChatUser user;
     private final GroupChatUser victim;
     private final String modes;
 
-    public ChannelUsermodechangeEvent(final long timestamp, final Channel channel,
+    public ChannelUserModeChangeEvent(final long timestamp, final Channel channel,
             final GroupChatUser user, final GroupChatUser victim, final String modes) {
         super(timestamp, channel);
         this.user = user;
@@ -42,8 +42,8 @@ public class ChannelUsermodechangeEvent extends ChannelDisplayableEvent {
         this.modes = modes;
     }
 
-    public ChannelUsermodechangeEvent(final Channel channel,
-            final GroupChatUser user, final GroupChatUser victim, final String modes) {
+    public ChannelUserModeChangeEvent(final Channel channel, final GroupChatUser user,
+            final GroupChatUser victim, final String modes) {
         super(channel);
         this.user = user;
         this.victim = victim;

src/com/dmdirc/events/QueryNickchangeEvent.java → src/com/dmdirc/events/QueryNickChangeEvent.java

@@ -27,16 +27,16 @@ import com.dmdirc.Query;
 /**
  * Fired when a user changes nickname in a query.
  */
-public class QueryNickchangeEvent extends QueryDisplayableEvent {
+public class QueryNickChangeEvent extends QueryDisplayableEvent {
 
     private final String oldNick;
 
-    public QueryNickchangeEvent(final long timestamp, final Query query, final String oldNick) {
+    public QueryNickChangeEvent(final long timestamp, final Query query, final String oldNick) {
         super(timestamp, query);
         this.oldNick = oldNick;
     }
 
-    public QueryNickchangeEvent(final Query query, final String oldNick) {
+    public QueryNickChangeEvent(final Query query, final String oldNick) {
         super(query);
         this.oldNick = oldNick;
     }

src/com/dmdirc/events/ServerAuthnoticeEvent.java → src/com/dmdirc/events/ServerAuthNoticeEvent.java

@@ -27,17 +27,17 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired on receiving an auth notice.
  */
-public class ServerAuthnoticeEvent extends ServerDisplayableEvent {
+public class ServerAuthNoticeEvent extends ServerDisplayableEvent {
 
     private final String notice;
 
-    public ServerAuthnoticeEvent(final long timestamp, final Connection connection,
+    public ServerAuthNoticeEvent(final long timestamp, final Connection connection,
             final String notice) {
         super(timestamp, connection);
         this.notice = notice;
     }
 
-    public ServerAuthnoticeEvent(final Connection connection, final String notice) {
+    public ServerAuthNoticeEvent(final Connection connection, final String notice) {
         super(connection);
         this.notice = notice;
     }

src/com/dmdirc/events/ServerCtcprEvent.java → src/com/dmdirc/events/ServerCtcpReplyEvent.java

@@ -28,21 +28,21 @@ import com.dmdirc.interfaces.User;
 /**
  * Fired when sending a CTCP reply.
  */
-public class ServerCtcprEvent extends ServerDisplayableEvent {
+public class ServerCtcpReplyEvent extends ServerDisplayableEvent {
 
     private final User user;
     private final String type;
     private final String content;
 
-    public ServerCtcprEvent(final long timestamp, final Connection connection,
-            final User user, final String type, final String content) {
+    public ServerCtcpReplyEvent(final long timestamp, final Connection connection, final User user,
+            final String type, final String content) {
         super(timestamp, connection);
         this.user = user;
         this.type = type;
         this.content = content;
     }
 
-    public ServerCtcprEvent(final Connection connection, final User user, final String type,
+    public ServerCtcpReplyEvent(final Connection connection, final User user, final String type,
             final String content) {
         super(connection);
         this.user = user;

src/com/dmdirc/events/ServerGotpingEvent.java → src/com/dmdirc/events/ServerGotPingEvent.java

@@ -27,16 +27,16 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when we receive a server ping reply.
  */
-public class ServerGotpingEvent extends ServerEvent {
+public class ServerGotPingEvent extends ServerEvent {
 
     private final long ping;
 
-    public ServerGotpingEvent(final long timestamp, final Connection connection, final long ping) {
+    public ServerGotPingEvent(final long timestamp, final Connection connection, final long ping) {
         super(timestamp, connection);
         this.ping = ping;
     }
 
-    public ServerGotpingEvent(final Connection connection, final long ping) {
+    public ServerGotPingEvent(final Connection connection, final long ping) {
         super(connection);
         this.ping = ping;
     }

src/com/dmdirc/events/ServerMotdendEvent.java → src/com/dmdirc/events/ServerMotdEndEvent.java

@@ -27,17 +27,17 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when the MOTD ends.
  */
-public class ServerMotdendEvent extends ServerDisplayableEvent {
+public class ServerMotdEndEvent extends ServerDisplayableEvent {
 
     private final String message;
 
-    public ServerMotdendEvent(final long timestamp, final Connection connection,
+    public ServerMotdEndEvent(final long timestamp, final Connection connection,
             final String message) {
         super(timestamp, connection);
         this.message = message;
     }
 
-    public ServerMotdendEvent(final Connection connection, final String message) {
+    public ServerMotdEndEvent(final Connection connection, final String message) {
         super(connection);
         this.message = message;
     }

src/com/dmdirc/events/ServerMotdlineEvent.java → src/com/dmdirc/events/ServerMotdLineEvent.java

@@ -27,17 +27,17 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when the MOTD line is received.
  */
-public class ServerMotdlineEvent extends ServerDisplayableEvent {
+public class ServerMotdLineEvent extends ServerDisplayableEvent {
 
     private final String message;
 
-    public ServerMotdlineEvent(final long timestamp, final Connection connection,
+    public ServerMotdLineEvent(final long timestamp, final Connection connection,
             final String message) {
         super(timestamp, connection);
         this.message = message;
     }
 
-    public ServerMotdlineEvent(final Connection connection, final String message) {
+    public ServerMotdLineEvent(final Connection connection, final String message) {
         super(connection);
         this.message = message;
     }

src/com/dmdirc/events/ServerMotdstartEvent.java → src/com/dmdirc/events/ServerMotdStartEvent.java

@@ -27,17 +27,17 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when the MOTD starts.
  */
-public class ServerMotdstartEvent extends ServerDisplayableEvent {
+public class ServerMotdStartEvent extends ServerDisplayableEvent {
 
     private final String message;
 
-    public ServerMotdstartEvent(final long timestamp, final Connection connection,
+    public ServerMotdStartEvent(final long timestamp, final Connection connection,
             final String message) {
         super(timestamp, connection);
         this.message = message;
     }
 
-    public ServerMotdstartEvent(final Connection connection, final String message) {
+    public ServerMotdStartEvent(final Connection connection, final String message) {
         super(connection);
         this.message = message;
     }

src/com/dmdirc/events/ServerNickchangeEvent.java → src/com/dmdirc/events/ServerNickChangeEvent.java

@@ -27,19 +27,19 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired on a change of a nickname.
  */
-public class ServerNickchangeEvent extends ServerDisplayableEvent {
+public class ServerNickChangeEvent extends ServerDisplayableEvent {
 
     private final String oldNick;
     private final String newNick;
 
-    public ServerNickchangeEvent(final long timestamp, final Connection connection,
+    public ServerNickChangeEvent(final long timestamp, final Connection connection,
             final String oldNick, final String newNick) {
         super(timestamp, connection);
         this.oldNick = oldNick;
         this.newNick = newNick;
     }
 
-    public ServerNickchangeEvent(final Connection connection, final String oldNick,
+    public ServerNickChangeEvent(final Connection connection, final String oldNick,
             final String newNick) {
         super(connection);
         this.oldNick = oldNick;

src/com/dmdirc/events/ServerNopingEvent.java → src/com/dmdirc/events/ServerNoPingEvent.java

@@ -27,16 +27,16 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when we miss a server ping reply.
  */
-public class ServerNopingEvent extends ServerEvent {
+public class ServerNoPingEvent extends ServerEvent {
 
     private final long ping;
 
-    public ServerNopingEvent(final long timestamp, final Connection connection, final long ping) {
+    public ServerNoPingEvent(final long timestamp, final Connection connection, final long ping) {
         super(timestamp, connection);
         this.ping = ping;
     }
 
-    public ServerNopingEvent(final Connection connection, final long ping) {
+    public ServerNoPingEvent(final Connection connection, final long ping) {
         super(connection);
         this.ping = ping;
     }

src/com/dmdirc/events/ServerPingsentEvent.java → src/com/dmdirc/events/ServerPingSentEvent.java

@@ -27,13 +27,13 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when sending a server ping request.
  */
-public class ServerPingsentEvent extends ServerEvent {
+public class ServerPingSentEvent extends ServerEvent {
 
-    public ServerPingsentEvent(final long timestamp, final Connection connection) {
+    public ServerPingSentEvent(final long timestamp, final Connection connection) {
         super(timestamp, connection);
     }
 
-    public ServerPingsentEvent(final Connection connection) {
+    public ServerPingSentEvent(final Connection connection) {
         super(connection);
     }
 

src/com/dmdirc/events/ServerServernoticeEvent.java → src/com/dmdirc/events/ServerServerNoticeEvent.java

@@ -28,19 +28,19 @@ import com.dmdirc.interfaces.User;
 /**
  * Fired when receiving a server notice.
  */
-public class ServerServernoticeEvent extends ServerDisplayableEvent {
+public class ServerServerNoticeEvent extends ServerDisplayableEvent {
 
     private final User user;
     private final String message;
 
-    public ServerServernoticeEvent(final long timestamp, final Connection connection,
+    public ServerServerNoticeEvent(final long timestamp, final Connection connection,
             final User user, final String message) {
         super(timestamp, connection);
         this.user = user;
         this.message = message;
     }
 
-    public ServerServernoticeEvent(final Connection connection, final User user,
+    public ServerServerNoticeEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
         this.user = user;

src/com/dmdirc/events/ServerUnknownactionEvent.java → src/com/dmdirc/events/ServerUnknownActionEvent.java

@@ -27,13 +27,13 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when an unknown action is received.
  */
-public class ServerUnknownactionEvent extends ServerDisplayableEvent {
+public class ServerUnknownActionEvent extends ServerDisplayableEvent {
 
     private final String sender;
     private final String target;
     private final String message;
 
-    public ServerUnknownactionEvent(final long timestamp, final Connection connection,
+    public ServerUnknownActionEvent(final long timestamp, final Connection connection,
             final String sender, final String target, final String message) {
         super(timestamp, connection);
         this.sender = sender;
@@ -41,7 +41,7 @@ public class ServerUnknownactionEvent extends ServerDisplayableEvent {
         this.message = message;
     }
 
-    public ServerUnknownactionEvent(final Connection connection, final String sender,
+    public ServerUnknownActionEvent(final Connection connection, final String sender,
             final String target, final String message) {
         super(connection);
         this.sender = sender;

src/com/dmdirc/events/ServerUnknownmessageEvent.java → src/com/dmdirc/events/ServerUnknownMessageEvent.java

@@ -27,13 +27,13 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when an unknown message is received.
  */
-public class ServerUnknownmessageEvent extends ServerDisplayableEvent {
+public class ServerUnknownMessageEvent extends ServerDisplayableEvent {
 
     private final String sender;
     private final String target;
     private final String message;
 
-    public ServerUnknownmessageEvent(final long timestamp, final Connection connection,
+    public ServerUnknownMessageEvent(final long timestamp, final Connection connection,
             final String sender, final String target, final String message) {
         super(timestamp, connection);
         this.sender = sender;
@@ -41,7 +41,7 @@ public class ServerUnknownmessageEvent extends ServerDisplayableEvent {
         this.message = message;
     }
 
-    public ServerUnknownmessageEvent(final Connection connection, final String sender,
+    public ServerUnknownMessageEvent(final Connection connection, final String sender,
             final String target, final String message) {
         super(connection);
         this.sender = sender;

src/com/dmdirc/events/ServerUnknownnoticeEvent.java → src/com/dmdirc/events/ServerUnknownNoticeEvent.java

@@ -27,13 +27,13 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fired when an unknown notice is received.
  */
-public class ServerUnknownnoticeEvent extends ServerDisplayableEvent {
+public class ServerUnknownNoticeEvent extends ServerDisplayableEvent {
 
     private final String sender;
     private final String target;
     private final String message;
 
-    public ServerUnknownnoticeEvent(final long timestamp, final Connection connection,
+    public ServerUnknownNoticeEvent(final long timestamp, final Connection connection,
             final String sender, final String target, final String message) {
         super(timestamp, connection);
         this.sender = sender;
@@ -41,7 +41,7 @@ public class ServerUnknownnoticeEvent extends ServerDisplayableEvent {
         this.message = message;
     }
 
-    public ServerUnknownnoticeEvent(final Connection connection, final String sender,
+    public ServerUnknownNoticeEvent(final Connection connection, final String sender,
             final String target, final String message) {
         super(connection);
         this.sender = sender;

src/com/dmdirc/events/ServerUsermodesEvent.java → src/com/dmdirc/events/ServerUserModesEvent.java

@@ -28,20 +28,20 @@ import com.dmdirc.interfaces.User;
 /**
  * Fired in on receipt of user modes.
  */
-public class ServerUsermodesEvent extends ServerDisplayableEvent {
+public class ServerUserModesEvent extends ServerDisplayableEvent {
 
     private final User user;
     private final String message;
 
-    public ServerUsermodesEvent(final long timestamp, final Connection connection,
-            final User user, final String message) {
+    public ServerUserModesEvent(final long timestamp, final Connection connection, final User user,
+            final String message) {
         super(timestamp, connection);
         this.user = user;
         this.message = message;
     }
 
-    public ServerUsermodesEvent(final Connection connection, final User user,
-            final String message) {
+    public ServerUserModesEvent(final Connection connection, final User user, final String
+            message) {
         super(connection);
         this.user = user;
         this.message = message;

src/com/dmdirc/events/ServerWalldesyncEvent.java

@@ -33,15 +33,15 @@ public class ServerWalldesyncEvent extends ServerDisplayableEvent {
     private final User user;
     private final String message;
 
-    public ServerWalldesyncEvent(final long timestamp, final Connection connection,
-            final User user, final String message) {
+    public ServerWalldesyncEvent(final long timestamp, final Connection connection, final User user,
+            final String message) {
         super(timestamp, connection);
         this.user = user;
         this.message = message;
     }
 
-    public ServerWalldesyncEvent(final Connection connection, final User user,
-            final String message) {
+    public ServerWalldesyncEvent(final Connection connection, final User user, final String
+            message) {
         super(connection);
         this.user = user;
         this.message = message;

src/com/dmdirc/ui/messages/HighlightManager.java

@@ -30,7 +30,7 @@ import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryHighlightEvent;
 import com.dmdirc.events.ServerConnectedEvent;
-import com.dmdirc.events.ServerNickchangeEvent;
+import com.dmdirc.events.ServerNickChangeEvent;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.colours.Colour;
@@ -93,7 +93,7 @@ public class HighlightManager {
     }
 
     @Handler
-    void handleNickChange(final ServerNickchangeEvent event) {
+    void handleNickChange(final ServerNickChangeEvent event) {
         setNickname(event.getNewNick());
     }