diff --git a/shadowsocks-csharp/Controller/FileManager.cs b/shadowsocks-csharp/Controller/FileManager.cs
index 940899f0..5b210ba8 100755
--- a/shadowsocks-csharp/Controller/FileManager.cs
+++ b/shadowsocks-csharp/Controller/FileManager.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Text;
 
-namespace shadowsocks_csharp.Controller
+namespace shadowsocks.Controller
 {
     public class FileManager
     {
diff --git a/shadowsocks-csharp/Controller/Local.cs b/shadowsocks-csharp/Controller/Local.cs
index a40c8119..a101a8fa 100755
--- a/shadowsocks-csharp/Controller/Local.cs
+++ b/shadowsocks-csharp/Controller/Local.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Text;
 using System.Net.Sockets;
 using System.Net;
-using shadowsocks_csharp.Encrypt;
-using shadowsocks_csharp.Model;
+using shadowsocks.Encrypt;
+using shadowsocks.Model;
 
-namespace shadowsocks_csharp.Controller
+namespace shadowsocks.Controller
 {
 
     class Local
diff --git a/shadowsocks-csharp/Controller/PACServer.cs b/shadowsocks-csharp/Controller/PACServer.cs
index d0fa8ead..b103c370 100755
--- a/shadowsocks-csharp/Controller/PACServer.cs
+++ b/shadowsocks-csharp/Controller/PACServer.cs
@@ -1,4 +1,4 @@
-using shadowsocks_csharp.Properties;
+using shadowsocks.Properties;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -8,7 +8,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 
-namespace shadowsocks_csharp.Controller
+namespace shadowsocks.Controller
 {
     class PACServer
     {
diff --git a/shadowsocks-csharp/Controller/PolipoRunner.cs b/shadowsocks-csharp/Controller/PolipoRunner.cs
index 875a0c7b..8d74c448 100755
--- a/shadowsocks-csharp/Controller/PolipoRunner.cs
+++ b/shadowsocks-csharp/Controller/PolipoRunner.cs
@@ -1,5 +1,5 @@
-using shadowsocks_csharp.Model;
-using shadowsocks_csharp.Properties;
+using shadowsocks.Model;
+using shadowsocks.Properties;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -7,7 +7,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Text;
 
-namespace shadowsocks_csharp.Controller
+namespace shadowsocks.Controller
 {
     class PolipoRunner
     {
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
index 75790584..11c92724 100755
--- a/shadowsocks-csharp/Controller/ShadowsocksController.cs
+++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -1,9 +1,9 @@
-using shadowsocks_csharp.Model;
+using shadowsocks.Model;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace shadowsocks_csharp.Controller
+namespace shadowsocks.Controller
 {
     public class ShadowsocksController
     {
diff --git a/shadowsocks-csharp/Controller/SystemProxy.cs b/shadowsocks-csharp/Controller/SystemProxy.cs
index 264406c8..f47f326e 100755
--- a/shadowsocks-csharp/Controller/SystemProxy.cs
+++ b/shadowsocks-csharp/Controller/SystemProxy.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace shadowsocks_csharp.Controller
+namespace shadowsocks.Controller
 {
     public class SystemProxy
     {
diff --git a/shadowsocks-csharp/Encrypt/EncryptorBase.cs b/shadowsocks-csharp/Encrypt/EncryptorBase.cs
index 5420cfb6..96da6269 100644
--- a/shadowsocks-csharp/Encrypt/EncryptorBase.cs
+++ b/shadowsocks-csharp/Encrypt/EncryptorBase.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace shadowsocks_csharp.Encrypt
+namespace shadowsocks.Encrypt
 {
     public abstract class EncryptorBase
         : IEncryptor
diff --git a/shadowsocks-csharp/Encrypt/EncryptorFactory.cs b/shadowsocks-csharp/Encrypt/EncryptorFactory.cs
index 58d77715..38bbade4 100644
--- a/shadowsocks-csharp/Encrypt/EncryptorFactory.cs
+++ b/shadowsocks-csharp/Encrypt/EncryptorFactory.cs
@@ -1,5 +1,5 @@
-
-namespace shadowsocks_csharp.Encrypt
+
+namespace shadowsocks.Encrypt
 {
     public static class EncryptorFactory
     {
diff --git a/shadowsocks-csharp/Encrypt/IEncryptor.cs b/shadowsocks-csharp/Encrypt/IEncryptor.cs
index b48828b6..99dff850 100644
--- a/shadowsocks-csharp/Encrypt/IEncryptor.cs
+++ b/shadowsocks-csharp/Encrypt/IEncryptor.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace shadowsocks_csharp.Encrypt
-{
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace shadowsocks.Encrypt
+{
     public interface IEncryptor : IDisposable
     {
         void Encrypt(byte[] buf, int length, byte[] outbuf, out int outlength);
-        void Decrypt(byte[] buf, int length, byte[] outbuf, out int outlength);
-    }
-}
+        void Decrypt(byte[] buf, int length, byte[] outbuf, out int outlength);
+    }
+}
diff --git a/shadowsocks-csharp/Encrypt/PolarSSL.cs b/shadowsocks-csharp/Encrypt/PolarSSL.cs
index 70dc75e5..d2b02784 100755
--- a/shadowsocks-csharp/Encrypt/PolarSSL.cs
+++ b/shadowsocks-csharp/Encrypt/PolarSSL.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace shadowsocks_csharp.Encrypt
+namespace shadowsocks.Encrypt
 {
     public class PolarSSL
     {
diff --git a/shadowsocks-csharp/Encrypt/PolarSSLEncryptor.cs b/shadowsocks-csharp/Encrypt/PolarSSLEncryptor.cs
index e14b26ab..9f176c3b 100755
--- a/shadowsocks-csharp/Encrypt/PolarSSLEncryptor.cs
+++ b/shadowsocks-csharp/Encrypt/PolarSSLEncryptor.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace shadowsocks_csharp.Encrypt
+namespace shadowsocks.Encrypt
 {
     public class PolarSSLEncryptor
         : EncryptorBase, IDisposable
diff --git a/shadowsocks-csharp/Encrypt/TableEncryptor.cs b/shadowsocks-csharp/Encrypt/TableEncryptor.cs
index dc087160..ae02fd8b 100644
--- a/shadowsocks-csharp/Encrypt/TableEncryptor.cs
+++ b/shadowsocks-csharp/Encrypt/TableEncryptor.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace shadowsocks_csharp.Encrypt
+namespace shadowsocks.Encrypt
 {
     public class TableEncryptor
         : EncryptorBase
diff --git a/shadowsocks-csharp/Model/Configuration.cs b/shadowsocks-csharp/Model/Configuration.cs
index e81c2c13..624ac510 100755
--- a/shadowsocks-csharp/Model/Configuration.cs
+++ b/shadowsocks-csharp/Model/Configuration.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace shadowsocks_csharp.Model
+namespace shadowsocks.Model
 {
     [Serializable]
     public class Configuration
diff --git a/shadowsocks-csharp/Model/Server.cs b/shadowsocks-csharp/Model/Server.cs
index f2d737ad..b5767738 100755
--- a/shadowsocks-csharp/Model/Server.cs
+++ b/shadowsocks-csharp/Model/Server.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Diagnostics;
 using SimpleJson;
 
-namespace shadowsocks_csharp.Model
+namespace shadowsocks.Model
 {
     [Serializable]
     public class Server
diff --git a/shadowsocks-csharp/Program.cs b/shadowsocks-csharp/Program.cs
index 0913fda3..342bae8f 100755
--- a/shadowsocks-csharp/Program.cs
+++ b/shadowsocks-csharp/Program.cs
@@ -1,13 +1,13 @@
-using shadowsocks_csharp.Controller;
-using shadowsocks_csharp.Properties;
-using shadowsocks_csharp.View;
+using shadowsocks.Controller;
+using shadowsocks.Properties;
+using shadowsocks.View;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace shadowsocks_csharp
+namespace shadowsocks
 {
     static class Program
     {
diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs
index 3a7e8121..0f52657c 100755
--- a/shadowsocks-csharp/Properties/Resources.Designer.cs
+++ b/shadowsocks-csharp/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace shadowsocks_csharp.Properties {
+namespace shadowsocks.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace shadowsocks_csharp.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("shadowsocks_csharp.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("shadowsocks.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -71,23 +71,13 @@ namespace shadowsocks_csharp.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to # Sample configuration file for Polipo. -*-sh-*-
-        ///
-        ///# You should not need to use a configuration file; all configuration
-        ///# variables have reasonable defaults.  If you want to use one, you
-        ///# can copy this to /etc/polipo/config or to ~/.polipo and modify.
-        ///
-        ///# This file only contains some of the configuration variables; see the
-        ///# list given by ``polipo -v&apos;&apos; and the manual for more.
-        ///
-        ///
-        ///### Basic configuration
-        ///### *******************
-        ///
-        ///# Uncomment one of these if you want to allow remote clients to
-        ///# connect:
-        ///
-        ///# prox [rest of string was truncated]&quot;;.
+        ///   Looks up a localized string similar to proxyAddress = &quot;127.0.0.1&quot;
+        ///
+        ///socksParentProxy = &quot;127.0.0.1:__SOCKS_PORT__&quot;
+        ///socksProxyType = socks5
+        ///diskCacheRoot = &quot;&quot;
+        ///localDocumentRoot = &quot;&quot;
+        ///.
         /// </summary>
         internal static string polipo_config {
             get {
diff --git a/shadowsocks-csharp/Properties/Settings.Designer.cs b/shadowsocks-csharp/Properties/Settings.Designer.cs
index 71b1745e..b6aaa111 100755
--- a/shadowsocks-csharp/Properties/Settings.Designer.cs
+++ b/shadowsocks-csharp/Properties/Settings.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace shadowsocks_csharp.Properties {
+namespace shadowsocks.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/shadowsocks-csharp/View/ConfigForm.Designer.cs b/shadowsocks-csharp/View/ConfigForm.Designer.cs
index ec069fcd..7058d702 100755
--- a/shadowsocks-csharp/View/ConfigForm.Designer.cs
+++ b/shadowsocks-csharp/View/ConfigForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace shadowsocks_csharp.View
+namespace shadowsocks.View
 {
     partial class ConfigForm
     {
diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs
index 6ed1128d..d6697473 100755
--- a/shadowsocks-csharp/View/ConfigForm.cs
+++ b/shadowsocks-csharp/View/ConfigForm.cs
@@ -5,10 +5,10 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 using System.Diagnostics;
-using shadowsocks_csharp.Controller;
-using shadowsocks_csharp.Model;
+using shadowsocks.Controller;
+using shadowsocks.Model;
 
-namespace shadowsocks_csharp.View
+namespace shadowsocks.View
 {
     public partial class ConfigForm : Form
     {
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index ca356a64..d52bd33f 100755
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>shadowsocks_csharp</RootNamespace>
+    <RootNamespace>shadowsocks</RootNamespace>
     <AssemblyName>Shadowsocks</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>