diff --git a/spaceport/build.gradle b/spaceport/build.gradle
index 9022890..3cd0fad 100644
--- a/spaceport/build.gradle
+++ b/spaceport/build.gradle
@@ -15,9 +15,9 @@ compileJava {
 jar {
     manifest {
         name = 'ASys MC server manager'
-        instruction 'Bundle-Activator', 'asys.mcsmanager.Activator'
+        instruction 'Bundle-Activator', 'asys.spaceport.Activator'
         instruction 'Import-Package',
-                '!asys.mcsmanager.packets.*',
+                '!asys.spaceport.packets.*',
                 'io.netty.buffer;version="[4.0,5)"',
                 'io.netty.handler.codec;version="[4.0,5)"',
                 'io.netty.handler.codec.http;version="[4.0,5)"',
diff --git a/spaceport/src/main/java/asys/spaceport/Activator.java b/spaceport/src/main/java/asys/spaceport/Activator.java
index b98edbc..0ced452 100644
--- a/spaceport/src/main/java/asys/spaceport/Activator.java
+++ b/spaceport/src/main/java/asys/spaceport/Activator.java
@@ -37,15 +37,15 @@ public class Activator implements BundleActivator, ServiceListener {
         logger.debug("Register service listener");
         context.addServiceListener(this);
 
-        String host = config.getString("asys.mcsmanager.host", "127.0.0.1");
-        int port = config.getInt("asys.mcsmanager.port", 8779);
-        String passcode = config.getString("asys.mcsmanager.passcode", "testpasscode");
+        String host = config.getString("asys.spaceport.host", "127.0.0.1");
+        int port = config.getInt("asys.spaceport.port", 8779);
+        String passcode = config.getString("asys.spaceport.passcode", "testpasscode");
         logger.debug("Start server manager: {}:{}", host, port);
         serverManager = new asys.spaceport.server.Server();
         serverManager.start(host, port, passcode);
 
-        host = config.getString("asys.mcsmanager.webconsole.host", "127.0.0.1");
-        port = config.getInt("asys.mcsmanager.webconsole.port", 8770);
+        host = config.getString("asys.spaceport.webconsole.host", "127.0.0.1");
+        port = config.getInt("asys.spaceport.webconsole.port", 8770);
         logger.debug("Start webconsole server: {}:{}", host, port);
         webconsoleServer = new asys.spaceport.websocket.Server();
         webconsoleServer.start(host, port);
diff --git a/spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java b/spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java
index d48f276..1dd0b12 100644
--- a/spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java
+++ b/spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java
@@ -23,7 +23,7 @@ public class MCSM_WebModule extends WebModule {
             .registerTypeAdapter(ServerInfo.class, new ServerInfoSerializer())
             .registerTypeAdapter(CS_Ping.class, new CSPingJsonSerializer())
             .create();
-    private final String MODULE_NAME = "mcsmanager";
+    private final String MODULE_NAME = "spaceport";
     private final String MODULE_URL = "/"+MODULE_NAME;
     private final Pattern URL_PATTERN_JS = Pattern.compile(MODULE_URL+"/(\\w+)\\.js");
     private final Pattern URL_PATTERN_CSS = Pattern.compile(MODULE_URL+"/(\\w+)\\.css");
diff --git a/spaceport/src/main/resources/module.js b/spaceport/src/main/resources/module.js
index 62b2236..d85ac8a 100644
--- a/spaceport/src/main/resources/module.js
+++ b/spaceport/src/main/resources/module.js
@@ -1,7 +1,7 @@
 var ContentModule = React.createClass({
     requestServerList: function() {
         var _this = this;
-        fetch('/mcsmanager/servers.json')
+        fetch('/spaceport/servers.json')
             .then(function(response) {
                 response.json().then(function(data) {
                     console.debug(data);
@@ -21,7 +21,7 @@ var ContentModule = React.createClass({
     },
     clickServerListItem: function(title) {
         var _this = this;
-        fetch('/mcsmanager/servers.json?clientid='+title)
+        fetch('/spaceport/servers.json?clientid='+title)
             .then(function(response){
                 response.json().then(function(data){
                     console.debug(data);
@@ -43,7 +43,7 @@ var ContentModule = React.createClass({
     componentWillMount: function(){
         var _this = this;
 
-        loadScript("/mcsmanager/components.js",
+        loadScript("/spaceport/components.js",
             function(){ _this.setState({nvScriptReady: _this.state.nvScriptReady+1}); console.debug('components - ok'); },
             function(){ _this.setState({nvScriptReady: -5}); console.debug('components - error'); }
         );
@@ -60,12 +60,12 @@ var ContentModule = React.createClass({
             function(){ _this.setState({nvScriptReady: -5}); console.error('d3 - error'); }
         );
 
-        loadScript("/mcsmanager/ansi_up.js",
+        loadScript("/spaceport/ansi_up.js",
             function(){ console.debug('ansi_up - ok'); },
             function(){ console.debug('ansi_up - error'); }
         );
 
-        loadStyle("/mcsmanager/moduleStyle.css");
+        loadStyle("/spaceport/moduleStyle.css");
 
         this.requestServerList();
     },