diff --git a/websocket-sharp/Server/WebSocketServiceHost.cs b/websocket-sharp/Server/WebSocketServiceHost.cs
index 8ee62e42..5dadf231 100644
--- a/websocket-sharp/Server/WebSocketServiceHost.cs
+++ b/websocket-sharp/Server/WebSocketServiceHost.cs
@@ -150,7 +150,7 @@ namespace WebSocketSharp.Server
/// A that represents the type of the behavior of
/// the service.
///
- public abstract Type Type { get; }
+ public abstract Type BehaviorType { get; }
///
/// Gets or sets the wait time for the response to the WebSocket Ping or Close.
diff --git a/websocket-sharp/Server/WebSocketServiceHost`1.cs b/websocket-sharp/Server/WebSocketServiceHost`1.cs
index d5efb80d..d4ca6a2d 100644
--- a/websocket-sharp/Server/WebSocketServiceHost`1.cs
+++ b/websocket-sharp/Server/WebSocketServiceHost`1.cs
@@ -63,7 +63,7 @@ namespace WebSocketSharp.Server
#region Public Properties
- public override Type Type {
+ public override Type BehaviorType {
get {
return typeof (TBehavior);
}