diff --git a/router/java/test/junit/net/i2p/router/transport/SSUDemo.java b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
index 73e8cdd60faf7fc39779e6390d579143ee987f9b..362b554621b96a9f2ca65b770cab80799fc1fb22 100644
--- a/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
+++ b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
@@ -12,6 +12,7 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
 import net.i2p.data.router.RouterIdentity;
 import net.i2p.data.router.RouterInfo;
+import net.i2p.router.RouterContext;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.I2NPMessageException;
@@ -181,7 +182,7 @@ public class SSUDemo {
     }
     
     private void peerRead(RouterInfo ri) {
-        RouterInfo old = _us.netDbSegmentor().store(ri.getIdentity().calculateHash(), ri);
+        RouterInfo old = _us.netDb().store(ri.getIdentity().calculateHash(), ri);
         if (old == null)
             newPeerRead(ri);
     }
@@ -314,7 +315,7 @@ public class SSUDemo {
             DatabaseStoreMessage m = (DatabaseStoreMessage)_msg;
             System.out.println("RECV: " + m);
             try {
-                _us.netDbSegmentor().store(m.getKey(), (RouterInfo) m.getEntry());
+                _us.netDb().store(m.getKey(), (RouterInfo) m.getEntry());
             } catch (IllegalArgumentException iae) {
                 iae.printStackTrace();
             }
diff --git a/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
index e757c8feccc935a04d7178af82897bcaf091aad1..dd546639bfaca7a04e15765bd22b4911a50f447d 100644
--- a/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
+++ b/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
@@ -83,7 +83,7 @@ class UDPFlooder implements Runnable {
                     m.setMessageExpiration(_context.clock().now() + 10*1000);
                     m.setUniqueId(_context.random().nextLong(I2NPMessage.MAX_ID_VALUE));
                     if (true) {
-                        RouterInfo to = _context.netDbSegmentor().lookupRouterInfoLocally(peer.getRemotePeer());
+                        RouterInfo to = _context.netDb().lookupRouterInfoLocally(peer.getRemotePeer());
                         if (to == null)
                             continue;
                         OutNetMessage msg = new OutNetMessage(_context, m, m.getMessageExpiration(), 500, to);