diff --git a/gns3server/cert_utils/create_cert.sh b/gns3server/cert_utils/create_cert.sh
index 89f9a3fe..4828e110 100755
--- a/gns3server/cert_utils/create_cert.sh
+++ b/gns3server/cert_utils/create_cert.sh
@@ -20,11 +20,7 @@
 # Bash shell script for generating self-signed certs.
 # The certicate is automaticaly put in your GNS3 config
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    DST_DIR="$HOME/.config/gns3.net/ssl"
-else
-    DST_DIR="$HOME/.config/gns3/ssl"
-fi
+DST_DIR="$HOME/.config/GNS3/ssl"
 OLD_DIR=`pwd`
 
 fail_if_error() {
diff --git a/gns3server/config.py b/gns3server/config.py
index e1bae39f..3efc6cba 100644
--- a/gns3server/config.py
+++ b/gns3server/config.py
@@ -76,10 +76,7 @@ class Config(object):
             # 4: /etc/xdg/GNS3.conf
             # 5: server.conf in the current working directory
 
-            if sys.platform.startswith("darwin"):
-                appname = "gns3.net"
-            else:
-                appname = "GNS3"
+            appname = "GNS3"
             home = os.path.expanduser("~")
             filename = "gns3_server.conf"
             if self._files is None: