diff --git a/src/helma/objectmodel/TransientNode.java b/src/helma/objectmodel/TransientNode.java
index 67f99e6b..ab5d199e 100644
--- a/src/helma/objectmodel/TransientNode.java
+++ b/src/helma/objectmodel/TransientNode.java
@@ -19,6 +19,7 @@ package helma.objectmodel;
 import helma.framework.IPathElement;
 import helma.objectmodel.db.DbMapping;
 import helma.objectmodel.db.Relation;
+import helma.objectmodel.db.Node;
 import helma.util.*;
 import java.io.*;
 import java.util.Date;
@@ -588,7 +589,7 @@ public class TransientNode implements INode, Serializable {
     }
 
     private Property makeVirtualNode(String propname, Relation rel) {
-        INode node = new helma.objectmodel.db.Node(rel.getPropName(), rel.getPrototype(),
+        INode node = new Node(rel.getPropName(), rel.getPrototype(),
                                                    dbmap.getWrappedNodeManager());
 
         // node.setState (TRANSIENT);
diff --git a/src/helma/objectmodel/dom/XmlWriter.java b/src/helma/objectmodel/dom/XmlWriter.java
index 15691356..e73b7954 100644
--- a/src/helma/objectmodel/dom/XmlWriter.java
+++ b/src/helma/objectmodel/dom/XmlWriter.java
@@ -268,7 +268,7 @@ public class XmlWriter extends OutputStreamWriter implements XmlConstants {
                           throws IOException {
         Enumeration e = null;
 
-        if (dbmode && node instanceof helma.objectmodel.db.Node) {
+        if (dbmode && node instanceof Node) {
             // a newly constructed db.Node doesn't have a propMap,
             // but returns an enumeration of all it's db-mapped properties
             Hashtable props = ((Node) node).getPropMap();
@@ -392,7 +392,7 @@ public class XmlWriter extends OutputStreamWriter implements XmlConstants {
      * loop through the children-array and print them as <hop:child>
      */
     private void writeChildren(INode node, int level) throws IOException {
-        if (dbmode && node instanceof helma.objectmodel.db.Node) {
+        if (dbmode && node instanceof Node) {
             Node dbNode = (Node) node;
             DbMapping smap = (dbNode.getDbMapping() == null) ? null
                                                              : dbNode.getDbMapping()
diff --git a/src/helma/scripting/rhino/HopObjectCtor.java b/src/helma/scripting/rhino/HopObjectCtor.java
index e8f71a3f..1f00ce61 100644
--- a/src/helma/scripting/rhino/HopObjectCtor.java
+++ b/src/helma/scripting/rhino/HopObjectCtor.java
@@ -15,14 +15,15 @@
  */
 package helma.scripting.rhino;
 
-import org.mozilla.javascript.*;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
 import helma.objectmodel.INode;
 import helma.objectmodel.db.DbMapping;
 import helma.objectmodel.db.DbKey;
+import helma.objectmodel.db.Node;
+
+import org.mozilla.javascript.*;
 
 public class HopObjectCtor extends FunctionObject {
 
@@ -89,8 +90,8 @@ public class HopObjectCtor extends FunctionObject {
                 throw new EvaluatorException(x.toString());
             }
         } else {
-            INode node = new helma.objectmodel.db.Node(protoname, protoname,
-                                                    core.app.getWrappedNodeManager());
+            INode node = new Node(protoname, protoname,
+                    core.app.getWrappedNodeManager());
             Scriptable proto = core.getPrototype(protoname);
             HopObject hobj = new HopObject(protoname, core, node, proto);
 
diff --git a/src/helma/scripting/rhino/RhinoEngine.java b/src/helma/scripting/rhino/RhinoEngine.java
index 8c376162..d55a0f44 100644
--- a/src/helma/scripting/rhino/RhinoEngine.java
+++ b/src/helma/scripting/rhino/RhinoEngine.java
@@ -26,6 +26,7 @@ import helma.main.Server;
 import helma.objectmodel.*;
 import helma.objectmodel.db.DbMapping;
 import helma.objectmodel.db.Relation;
+import helma.objectmodel.db.Node;
 import helma.scripting.*;
 import helma.scripting.rhino.debug.Tracer;
 import helma.util.StringUtils;
@@ -536,8 +537,8 @@ public class RhinoEngine implements ScriptingEngine {
                 protected Object replaceObject(Object obj) throws IOException {
                     if (obj instanceof HopObject)
                         return new HopObjectProxy((HopObject) obj);
-                    if (obj instanceof helma.objectmodel.db.Node)
-                        return new HopObjectProxy((helma.objectmodel.db.Node) obj);
+                    if (obj instanceof Node)
+                        return new HopObjectProxy((Node) obj);
                     if (obj instanceof GlobalObject)
                         return new GlobalProxy((GlobalObject) obj);
                     if (obj instanceof ApplicationBean)
diff --git a/src/helma/scripting/rhino/SerializationProxy.java b/src/helma/scripting/rhino/SerializationProxy.java
index 9ad43a3a..ab7b72e5 100644
--- a/src/helma/scripting/rhino/SerializationProxy.java
+++ b/src/helma/scripting/rhino/SerializationProxy.java
@@ -18,6 +18,7 @@ package helma.scripting.rhino;
 
 import helma.objectmodel.INode;
 import helma.objectmodel.db.NodeHandle;
+import helma.objectmodel.db.Node;
 import org.mozilla.javascript.Context;
 
 import java.io.Serializable;
@@ -83,8 +84,8 @@ class HopObjectProxy implements SerializationProxy {
         if (n == null) {
             ref = obj.getClassName();
         } else {
-            if (n instanceof helma.objectmodel.db.Node) {
-                ref = new NodeHandle((helma.objectmodel.db.Node) n);
+            if (n instanceof Node) {
+                ref = new NodeHandle((Node) n);
             } else {
                 ref = n;
             }
@@ -92,7 +93,7 @@ class HopObjectProxy implements SerializationProxy {
         wrapped = true;
     }
 
-    HopObjectProxy(helma.objectmodel.db.Node node) {
+    HopObjectProxy(Node node) {
         ref = new NodeHandle(node.getKey());
     }
 
diff --git a/src/helma/scripting/rhino/extensions/XmlObject.java b/src/helma/scripting/rhino/extensions/XmlObject.java
index 860bc2b1..3f7d4a0e 100644
--- a/src/helma/scripting/rhino/extensions/XmlObject.java
+++ b/src/helma/scripting/rhino/extensions/XmlObject.java
@@ -246,7 +246,7 @@ public class XmlObject {
                 converter = new XmlConverter();
             }
 
-            INode node = new helma.objectmodel.db.Node(null, null,
+            INode node = new Node(null, null,
                     core.getApplication().getWrappedNodeManager());
             INode result = converter.convert(url, node);