diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index 2fc5f75..a630ef3 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -170,9 +170,8 @@ int FlippRServer::main(const std::vector<std::string>& args)
 
 HTTPServer* FlippRServer::build_output_server()
 {
-  unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", this->output_port);
+  unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
 
-  // todo XDG_RUNTIME_DIR
   std::string runtime_dir = this->get_runtime_dir();
 
   SocketAddress address(runtime_dir + SOCKET_NAME);
@@ -183,9 +182,8 @@ HTTPServer* FlippRServer::build_output_server()
 
 TCPServer* FlippRServer::build_input_server()
 {
-  unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", this->output_port);
+  unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
 
-  //TODO adapt path
   std::string runtime_dir = this->get_runtime_dir();
   SocketAddress address(runtime_dir + SOCKET_NAME);
   ServerSocket server_socket(address);