diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index df6d04cb..54874b74 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -223,20 +223,20 @@ namespace WebSocketSharp
 
     internal static string CheckIfStart (this ServerState state)
     {
-      return state == ServerState.READY
-             ? "The server hasn't started yet."
-             : state == ServerState.SHUTDOWN
+      return state == ServerState.Ready
+             ? "The server hasn't yet started."
+             : state == ServerState.ShuttingDown
                ? "The server is shutting down."
-               : state == ServerState.STOP
+               : state == ServerState.Stop
                  ? "The server has already stopped."
                  : null;
     }
 
     internal static string CheckIfStartable (this ServerState state)
     {
-      return state == ServerState.START
+      return state == ServerState.Start
              ? "The server has already started."
-             : state == ServerState.SHUTDOWN
+             : state == ServerState.ShuttingDown
                ? "The server is shutting down."
                : null;
     }
diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs
index 12703aab..877023a4 100644
--- a/websocket-sharp/Server/HttpServer.cs
+++ b/websocket-sharp/Server/HttpServer.cs
@@ -142,7 +142,7 @@ namespace WebSocketSharp.Server
       _listener = new HttpListener ();
       _logger = new Logger ();
       _services = new WebSocketServiceManager (_logger);
-      _state = ServerState.READY;
+      _state = ServerState.Ready;
       _sync = new object ();
 
       var os = Environment.OSVersion;
@@ -208,7 +208,7 @@ namespace WebSocketSharp.Server
     /// </value>
     public bool IsListening {
       get {
-        return _state == ServerState.START;
+        return _state == ServerState.Start;
       }
     }
 
@@ -406,14 +406,14 @@ namespace WebSocketSharp.Server
         if (!IsListening)
           return;
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       _services.Stop (
         ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true);
 
       _listener.Abort ();
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     private void acceptHttpRequest (HttpListenerContext context)
@@ -535,7 +535,7 @@ namespace WebSocketSharp.Server
 
     private bool canSet (string property)
     {
-      if (_state == ServerState.START || _state == ServerState.SHUTDOWN) {
+      if (_state == ServerState.Start || _state == ServerState.ShuttingDown) {
         _logger.Error (
           String.Format (
             "Set operation of {0} isn't available because the server has already started.",
@@ -720,7 +720,7 @@ namespace WebSocketSharp.Server
         _listener.Start ();
         startReceiving ();
 
-        _state = ServerState.START;
+        _state = ServerState.Start;
       }
     }
 
@@ -736,13 +736,13 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       _services.Stop (new byte [0], true);
       stopListener (5000);
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     /// <summary>
@@ -770,13 +770,13 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       _services.Stop (data, !code.IsReserved ());
       stopListener (5000);
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     /// <summary>
@@ -802,13 +802,13 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       _services.Stop (data, !code.IsReserved ());
       stopListener (5000);
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     #endregion
diff --git a/websocket-sharp/Server/ServerState.cs b/websocket-sharp/Server/ServerState.cs
index 1a4b9254..7fbf17fc 100644
--- a/websocket-sharp/Server/ServerState.cs
+++ b/websocket-sharp/Server/ServerState.cs
@@ -4,8 +4,8 @@
  *
  * The MIT License
  *
- * Copyright (c) 2013 sta.blockhead
- * 
+ * Copyright (c) 2014 sta.blockhead
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -15,7 +15,7 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,9 +32,9 @@ namespace WebSocketSharp.Server
 {
   internal enum ServerState
   {
-    READY,
-    START,
-    SHUTDOWN,
-    STOP
+    Ready,
+    Start,
+    ShuttingDown,
+    Stop
   }
 }
diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index c144abc6..6aa0caa7 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -334,7 +334,7 @@ namespace WebSocketSharp.Server
     /// </value>
     public bool IsListening {
       get {
-        return _state == ServerState.START;
+        return _state == ServerState.Start;
       }
     }
 
@@ -461,14 +461,14 @@ namespace WebSocketSharp.Server
         if (!IsListening)
           return;
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       _listener.Stop ();
       _services.Stop (
         ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true);
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     private void acceptRequestAsync (TcpClient client)
@@ -551,7 +551,7 @@ namespace WebSocketSharp.Server
 
     private bool canSet (string property)
     {
-      if (_state == ServerState.START || _state == ServerState.SHUTDOWN) {
+      if (_state == ServerState.Start || _state == ServerState.ShuttingDown) {
         _logger.Error (
           String.Format (
             "Set operation of {0} isn't available because the server has already started.",
@@ -576,7 +576,7 @@ namespace WebSocketSharp.Server
       _listener = new TcpListener (_address, _port);
       _logger = new Logger ();
       _services = new WebSocketServiceManager (_logger);
-      _state = ServerState.READY;
+      _state = ServerState.Ready;
       _sync = new object ();
     }
 
@@ -738,7 +738,7 @@ namespace WebSocketSharp.Server
         _listener.Start ();
         startReceiving ();
 
-        _state = ServerState.START;
+        _state = ServerState.Start;
       }
     }
 
@@ -754,13 +754,13 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       stopListener (5000);
       _services.Stop (new byte [0], true);
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     /// <summary>
@@ -788,13 +788,13 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       stopListener (5000);
       _services.Stop (data, !code.IsReserved ());
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     /// <summary>
@@ -820,13 +820,13 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
       }
 
       stopListener (5000);
       _services.Stop (data, !code.IsReserved ());
 
-      _state = ServerState.STOP;
+      _state = ServerState.Stop;
     }
 
     #endregion
diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs
index 072cccd6..dcec6f3c 100644
--- a/websocket-sharp/Server/WebSocketServiceManager.cs
+++ b/websocket-sharp/Server/WebSocketServiceManager.cs
@@ -64,7 +64,7 @@ namespace WebSocketSharp.Server
 
       _hosts = new Dictionary<string, WebSocketServiceHost> ();
       _keepClean = true;
-      _state = ServerState.READY;
+      _state = ServerState.Ready;
       _sync = new object ();
     }
 
@@ -170,7 +170,7 @@ namespace WebSocketSharp.Server
       get {
         var count = 0;
         foreach (var host in Hosts) {
-          if (_state != ServerState.START)
+          if (_state != ServerState.Start)
             break;
 
           count += host.Sessions.Count;
@@ -189,7 +189,7 @@ namespace WebSocketSharp.Server
       var cache = new Dictionary<CompressionMethod, byte []> ();
       try {
         foreach (var host in Hosts) {
-          if (_state != ServerState.START)
+          if (_state != ServerState.Start)
             break;
 
           host.Sessions.Broadcast (opcode, data, cache);
@@ -211,7 +211,7 @@ namespace WebSocketSharp.Server
       var cache = new Dictionary<CompressionMethod, Stream> ();
       try {
         foreach (var host in Hosts) {
-          if (_state != ServerState.START)
+          if (_state != ServerState.Start)
             break;
 
           host.Sessions.Broadcast (opcode, stream, cache);
@@ -248,7 +248,7 @@ namespace WebSocketSharp.Server
     {
       var result = new Dictionary<string, Dictionary<string, bool>> ();
       foreach (var host in Hosts) {
-        if (_state != ServerState.START)
+        if (_state != ServerState.Start)
           break;
 
         result.Add (host.Path, host.Sessions.Broadping (frame, millisecondsTimeout));
@@ -272,7 +272,7 @@ namespace WebSocketSharp.Server
           return;
         }
 
-        if (_state == ServerState.START)
+        if (_state == ServerState.Start)
           host.Sessions.Start ();
 
         _hosts.Add (path, host);
@@ -293,7 +293,7 @@ namespace WebSocketSharp.Server
         _hosts.Remove (path);
       }
 
-      if (host.Sessions.State == ServerState.START)
+      if (host.Sessions.State == ServerState.Start)
         host.Sessions.Stop (
           ((ushort) CloseStatusCode.AWAY).ToByteArrayInternally (ByteOrder.BIG), true);
 
@@ -306,14 +306,14 @@ namespace WebSocketSharp.Server
         foreach (var host in _hosts.Values)
           host.Sessions.Start ();
 
-        _state = ServerState.START;
+        _state = ServerState.Start;
       }
     }
 
     internal void Stop (byte [] data, bool send)
     {
       lock (_sync) {
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
 
         var payload = new PayloadData (data);
         var args = new CloseEventArgs (payload);
@@ -325,7 +325,7 @@ namespace WebSocketSharp.Server
           host.Sessions.Stop (args, frameAsBytes);
 
         _hosts.Clear ();
-        _state = ServerState.STOP;
+        _state = ServerState.Stop;
       }
     }
 
diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs
index d0f7811d..3a16456e 100644
--- a/websocket-sharp/Server/WebSocketSessionManager.cs
+++ b/websocket-sharp/Server/WebSocketSessionManager.cs
@@ -81,7 +81,7 @@ namespace WebSocketSharp.Server
       _forSweep = new object ();
       _keepClean = true;
       _sessions = new Dictionary<string, IWebSocketSession> ();
-      _state = ServerState.READY;
+      _state = ServerState.Ready;
       _sync = new object ();
 
       setSweepTimer (60000);
@@ -138,7 +138,7 @@ namespace WebSocketSharp.Server
     /// </value>
     public IEnumerable<string> IDs {
       get {
-        if (_state == ServerState.SHUTDOWN)
+        if (_state == ServerState.ShuttingDown)
           return _emptySessions.Keys;
 
         lock (_sync) {
@@ -199,7 +199,7 @@ namespace WebSocketSharp.Server
           return;
 
         _keepClean = value;
-        if (_state == ServerState.START)
+        if (_state == ServerState.Start)
           _sweepTimer.Enabled = value;
       }
     }
@@ -213,7 +213,7 @@ namespace WebSocketSharp.Server
     /// </value>
     public IEnumerable<IWebSocketSession> Sessions {
       get {
-        if (_state == ServerState.SHUTDOWN)
+        if (_state == ServerState.ShuttingDown)
           return _emptySessions.Values;
 
         lock (_sync) {
@@ -304,7 +304,7 @@ namespace WebSocketSharp.Server
     internal string Add (IWebSocketSession session)
     {
       lock (_sync) {
-        if (_state != ServerState.START)
+        if (_state != ServerState.Start)
           return null;
 
         var id = createID ();
@@ -318,7 +318,7 @@ namespace WebSocketSharp.Server
       Opcode opcode, byte [] data, Dictionary<CompressionMethod, byte []> cache)
     {
       foreach (var session in Sessions) {
-        if (_state != ServerState.START)
+        if (_state != ServerState.Start)
           break;
 
         session.Context.WebSocket.Send (opcode, data, cache);
@@ -329,7 +329,7 @@ namespace WebSocketSharp.Server
       Opcode opcode, Stream stream, Dictionary <CompressionMethod, Stream> cache)
     {
       foreach (var session in Sessions) {
-        if (_state != ServerState.START)
+        if (_state != ServerState.Start)
           break;
 
         session.Context.WebSocket.Send (opcode, stream, cache);
@@ -340,7 +340,7 @@ namespace WebSocketSharp.Server
     {
       var result = new Dictionary<string, bool> ();
       foreach (var session in Sessions) {
-        if (_state != ServerState.START)
+        if (_state != ServerState.Start)
           break;
 
         result.Add (
@@ -360,7 +360,7 @@ namespace WebSocketSharp.Server
     internal void Start ()
     {
       _sweepTimer.Enabled = _keepClean;
-      _state = ServerState.START;
+      _state = ServerState.Start;
     }
 
     internal void Stop (byte [] data, bool send)
@@ -377,13 +377,13 @@ namespace WebSocketSharp.Server
     internal void Stop (CloseEventArgs args, byte [] frame)
     {
       lock (_sync) {
-        _state = ServerState.SHUTDOWN;
+        _state = ServerState.ShuttingDown;
 
         _sweepTimer.Enabled = false;
         foreach (var session in _sessions.Values.ToList ())
           session.Context.WebSocket.Close (args, frame, 1000);
 
-        _state = ServerState.STOP;
+        _state = ServerState.Stop;
       }
     }
 
@@ -798,13 +798,13 @@ namespace WebSocketSharp.Server
     /// </summary>
     public void Sweep ()
     {
-      if (_state != ServerState.START || _sweeping || Count == 0)
+      if (_state != ServerState.Start || _sweeping || Count == 0)
         return;
 
       lock (_forSweep) {
         _sweeping = true;
         foreach (var id in InactiveIDs) {
-          if (_state != ServerState.START)
+          if (_state != ServerState.Start)
             break;
 
           lock (_sync) {