diff --git a/lib/ndns/ndns.js b/lib/ndns/ndns.js
index 5058870..3b4a0bc 100644
--- a/lib/ndns/ndns.js
+++ b/lib/ndns/ndns.js
@@ -2338,19 +2338,19 @@ function MessageHeader ()
 }
 exports.MessageHeader = MessageHeader;
 
-function MessageQuestion (name, type, class)
+function MessageQuestion (name, type, class2)
 {
 	this.name = name;
 	this.type = type;
-	this.class = class;
+	this.class2 = class2;
 }
 exports.MessageQuestion = MessageQuestion;
 
-function MessageRR (name, type, class, ttl)
+function MessageRR (name, type, class2, ttl)
 {
 	this.name = name;
 	this.type = type;
-	this.class = class;
+	this.class2 = class2;
 	this.ttl = ttl;
 
 	if (arguments.length > 4) {
@@ -2381,14 +2381,14 @@ Message.prototype.addQuestion = function (qname, qtype, qclass)
 	this.question.push (q);
 	return q;
 };
-Message.prototype.addRR = function (sect, name, type, class, ttl)
+Message.prototype.addRR = function (sect, name, type, class2, ttl)
 {
 	var rr;
 	if (sect == ns_s.qd) {
-		rr = new MessageQuestion (name, type, class);
+		rr = new MessageQuestion (name, type, class2);
 	}
 	else {
-		rr = new MessageRR (name, type, class, ttl, Array.prototype.slice.call (arguments, 5));
+		rr = new MessageRR (name, type, class2, ttl, Array.prototype.slice.call (arguments, 5));
 	}
 	
 	switch (sect) {
@@ -2517,7 +2517,7 @@ Message.prototype.writeOnce = function (buf, bufsiz)
 				return (-1);
 
 			if (section == ns_s.qd) {
-				if (ns_newmsg_q (_newmsg, _dname, rr.type, rr.class) == -1) {
+				if (ns_newmsg_q (_newmsg, _dname, rr.type, rr.class2) == -1) {
 					return (-1);
 				}
 			}
@@ -2525,7 +2525,7 @@ Message.prototype.writeOnce = function (buf, bufsiz)
 				var nrdata = 0;
 				if ((nrdata = ns_rdata_pack (rr.type, rr.rdata, _rdata, 0, _rdata.length)) == -1)
 					return (-1);
-				if (ns_newmsg_rr (_newmsg, section, _dname, rr.type, rr.class, rr.ttl, nrdata, _rdata) == -1) {
+				if (ns_newmsg_rr (_newmsg, section, _dname, rr.type, rr.class2, rr.ttl, nrdata, _rdata) == -1) {
 					return (-1);
 				}
 			}
diff --git a/lib/ndns/ndns_client.js b/lib/ndns/ndns_client.js
index e66a4ad..cda1e77 100644
--- a/lib/ndns/ndns_client.js
+++ b/lib/ndns/ndns_client.js
@@ -19,7 +19,7 @@ function resolve (domain, rrtype, rrclass, server, cb) {
 
     var req = resolver.request(53, server);
     var type = ndns.ns_t[rrtype.toLowerCase()];
-    var class = ndns.ns_c[rrclass.toLowerCase()];
+    var class2 = ndns.ns_c[rrclass.toLowerCase()];
 
     active_queries++;
 
@@ -27,7 +27,7 @@ function resolve (domain, rrtype, rrclass, server, cb) {
     req.header.id = r_id;
     req.header.rd = 1; // recursion desired.
     req.header.qdcount = 1;
-    req.addQuestion (domain, type, class);
+    req.addQuestion (domain, type, class2);
     req.send();
 
     resolver.on("response", function handler(res) {
diff --git a/lib/nmcdns.js b/lib/nmcdns.js
index f1e10d9..e325ac2 100644
--- a/lib/nmcdns.js
+++ b/lib/nmcdns.js
@@ -20,7 +20,7 @@ function startServer(port, host, callback) {
     for (var i=0,l=req.question.length;i<l;i++) {
       var question = req.question[i];
       console.log("Question: What is",question.name,"?");
-      switch (question.class) {
+      switch (question.class2) {
       case ndns.ns_c.in:
       case ndns.ns_c.any:
         switch(question.type) {
@@ -53,7 +53,7 @@ function startServer(port, host, callback) {
         }
         break;
       default:
-        console.log("unhandled class:",question.class);
+        console.log("unhandled class:",question.class2);
         // XXX unhandled class. What's the right answer for that?
       }
     }
diff --git a/lib/nmcresolver.js b/lib/nmcresolver.js
index 30fba89..5084916 100644
--- a/lib/nmcresolver.js
+++ b/lib/nmcresolver.js
@@ -195,14 +195,14 @@ function resolveFromValue(host, type, parent, chunks, value, counter, callback)
   // 2. import processing
   while (value.import instanceof Array && value.import.length) {
     // implemented by progressively modifying the current value.
-    var import = value.import.shift();
-    if (import instanceof Array) {
-      return getRecord(import[0], import[1], function(err, data) {
+    var import2 = value.import.shift();
+    if (import2 instanceof Array) {
+      return getRecord(import2[0], import2[1], function(err, data) {
         if (err) { 
           // XXX is this too lax?
           return resolveFromValue(host, type, parent, chunks, value, counter + 1, callback);
         }
-        var subchunks = import[1].split(".").reverse();
+        var subchunks = import2[1].split(".").reverse();
         var base = value;
         while(subchunks.length) {
           var key = subchunks.shift();
diff --git a/package.json b/package.json
index 2948065..4f44b0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name" : "nmcsocks",
-  "version" : "0.4",
+  "version" : "0.4.0",
   "description" : "A socks proxy and DNS resolver for Namecoin.",
   "main" : "./nmcsocks",
   "repository" : {