diff --git a/jmdaemon/irc.py b/jmdaemon/irc.py
index e1f008d..685cb0b 100644
--- a/jmdaemon/irc.py
+++ b/jmdaemon/irc.py
@@ -9,10 +9,10 @@ import time
 import Queue
 
 
-from daemon.message_channel import MessageChannel
+from jmdaemon.message_channel import MessageChannel
 from jmbase.support import get_log, chunks
-from daemon.socks import socksocket, setdefaultproxy, PROXY_TYPE_SOCKS5
-from daemon.protocol import *
+from jmdaemon.socks import socksocket, setdefaultproxy, PROXY_TYPE_SOCKS5
+from jmdaemon.protocol import *
 MAX_PRIVMSG_LEN = 450
 PING_INTERVAL = 300
 PING_TIMEOUT = 60
diff --git a/jmdaemon/message_channel.py b/jmdaemon/message_channel.py
index 6e8d172..59ed575 100644
--- a/jmdaemon/message_channel.py
+++ b/jmdaemon/message_channel.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 from __future__ import print_function
 import base64, abc, threading, time
-from daemon import (
+from jmdaemon import (
     encrypt_encode, decode_decrypt, COMMAND_PREFIX, ORDER_KEYS,
     NICK_HASH_LENGTH, NICK_MAX_ENCODED, JM_VERSION, JOINMARKET_NICK_HEADER,
     nickname, plaintext_commands, encrypted_commands, commitment_broadcast_list,
diff --git a/jmdaemon/orderbookwatch.py b/jmdaemon/orderbookwatch.py
index e5bad22..1e5b33a 100644
--- a/jmdaemon/orderbookwatch.py
+++ b/jmdaemon/orderbookwatch.py
@@ -11,9 +11,9 @@ import threading
 import json
 from decimal import InvalidOperation, Decimal
 
-from daemon.protocol import JM_VERSION
+from jmdaemon.protocol import JM_VERSION
 from jmbase.support import get_log, joinmarket_alert, DUST_THRESHOLD
-from daemon.irc import B_PER_SEC
+from jmdaemon.irc import B_PER_SEC
 log = get_log()
 
 
diff --git a/joinmarketd.py b/joinmarketd.py
index eb37395..58ee82b 100644
--- a/joinmarketd.py
+++ b/joinmarketd.py
@@ -1,13 +1,13 @@
 #! /usr/bin/env python
 from __future__ import print_function
 import sys
-from daemon import (IRCMessageChannel, MessageChannelCollection,
+from jmdaemon import (IRCMessageChannel, MessageChannelCollection,
                         OrderbookWatch, as_init_encryption, init_pubkey,
                         NaclError, init_keypair, COMMAND_PREFIX, ORDER_KEYS,
                         NICK_HASH_LENGTH, NICK_MAX_ENCODED, JM_VERSION,
                         JOINMARKET_NICK_HEADER)
 
-from base.commands import *
+from jmbase.commands import *
 from twisted.protocols import amp
 from twisted.internet import reactor
 from twisted.internet.protocol import ServerFactory