diff --git a/jsdoc.js b/jsdoc.js
index 54ee1ccf..023a10f7 100644
--- a/jsdoc.js
+++ b/jsdoc.js
@@ -273,10 +273,10 @@ function main() {
 
         function indexAll(docs) {
             var lookupTable = {},
-                hasOwnProperty = Object.prototype.hasOwnProperty;
+                hasOwnProp = Object.prototype.hasOwnProperty;
 
             docs.forEach(function(doc) {
-                if ( !hasOwnProperty.call(lookupTable, doc.longname) ) {
+                if ( !hasOwnProp.call(lookupTable, doc.longname) ) {
                     lookupTable[doc.longname] = [];
                 }
                 lookupTable[doc.longname].push(doc);
diff --git a/rhino_modules/jsdoc/augment.js b/rhino_modules/jsdoc/augment.js
index 47a375c0..b08c82ee 100644
--- a/rhino_modules/jsdoc/augment.js
+++ b/rhino_modules/jsdoc/augment.js
@@ -1,7 +1,7 @@
 var doop = require("jsdoc/util/doop").doop;
 
 (function() {
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    var hasOwnProp = Object.prototype.hasOwnProperty;
     
     exports.addInherited = function(docs) {
         var dependencies = mapDependencies(docs.index);
@@ -11,7 +11,7 @@ var doop = require("jsdoc/util/doop").doop;
             var additions = getAdditions(doclets, docs);
             additions.forEach(function(doc) {
                 var name = doc.longname;
-                if ( !hasOwnProperty.call(docs.index, name) ) {
+                if ( !hasOwnProp.call(docs.index, name) ) {
                     docs.index[name] = [];
                 }
                 docs.index[name].push(doc);
diff --git a/rhino_modules/jsdoc/src/parser.js b/rhino_modules/jsdoc/src/parser.js
index 3a05be7d..ae90eab6 100644
--- a/rhino_modules/jsdoc/src/parser.js
+++ b/rhino_modules/jsdoc/src/parser.js
@@ -8,7 +8,7 @@
 var Token = Packages.org.mozilla.javascript.Token,
     currentParser = null,
     currentSourceName = '',
-    hasOwnProperty = Object.prototype.hasOwnProperty;
+    hasOwnProp = Object.prototype.hasOwnProperty;
 
 /**
  * @class
@@ -180,7 +180,7 @@ exports.Parser.prototype.astnodeToMemberof = function(node) {
             id = 'astnode'+scope.enclosingFunction.hashCode();
             doclet = this.refs[id];
             if (doclet && doclet.meta.vars && basename in doclet.meta.vars) {
-                var alias = hasOwnProperty.call(doclet.meta.vars, basename)? doclet.meta.vars[basename] : false;
+                var alias = hasOwnProp.call(doclet.meta.vars, basename)? doclet.meta.vars[basename] : false;
                 if (alias !== false) {
                     return [alias, basename];
                 }
@@ -190,7 +190,7 @@ exports.Parser.prototype.astnodeToMemberof = function(node) {
         }
         //First check to see if we have a global scope alias
         doclet = this.refs["__global__"];
-        if (doclet && doclet.meta.vars && hasOwnProperty.call(doclet.meta.vars, basename)) {
+        if (doclet && doclet.meta.vars && hasOwnProp.call(doclet.meta.vars, basename)) {
             var alias = doclet.meta.vars[basename];
             if (alias !== false) {
                 return [alias, basename];
diff --git a/rhino_modules/jsdoc/tag/dictionary.js b/rhino_modules/jsdoc/tag/dictionary.js
index 8e9e03d9..4f3c1651 100644
--- a/rhino_modules/jsdoc/tag/dictionary.js
+++ b/rhino_modules/jsdoc/tag/dictionary.js
@@ -7,7 +7,7 @@
 var _synonyms = {},
     _definitions = {},
     _namespaces = [],
-    hasOwnProperty = Object.prototype.hasOwnProperty;
+    hasOwnProp = Object.prototype.hasOwnProperty;
 
 function _TagDefinition(title, etc) {
     etc = etc || {};
@@ -15,7 +15,7 @@ function _TagDefinition(title, etc) {
     this.title = dictionary.normalise(title);
     
     for (var p in etc) {
-        if ( hasOwnProperty.call(etc, p) ) {
+        if ( hasOwnProp.call(etc, p) ) {
             this[p] = etc[p];
         }
     }
@@ -43,7 +43,7 @@ var dictionary = {
     lookUp: function(title) {
         title = dictionary.normalise(title);
         
-        if ( hasOwnProperty.call(_definitions, title) ) {
+        if ( hasOwnProp.call(_definitions, title) ) {
            return _definitions[title];
         }
         
@@ -59,7 +59,7 @@ var dictionary = {
     normalise: function(title) {
         canonicalName = title.toLowerCase();
             
-        if ( hasOwnProperty.call(_synonyms, canonicalName) ) {
+        if ( hasOwnProp.call(_synonyms, canonicalName) ) {
             return _synonyms[canonicalName];
         }
         
@@ -70,7 +70,7 @@ var dictionary = {
 require('jsdoc/tag/dictionary/definitions').defineTags(dictionary);
 
 for (var prop in dictionary) {
-    if ( hasOwnProperty.call(dictionary, prop) ) {
+    if ( hasOwnProp.call(dictionary, prop) ) {
         exports[prop] = dictionary[prop];
     }
 }
diff --git a/templates/default/publish.js b/templates/default/publish.js
index 85f554d4..794eb3d3 100644
--- a/templates/default/publish.js
+++ b/templates/default/publish.js
@@ -4,7 +4,7 @@
         fs = require('fs'),
         helper = require('jsdoc/util/templateHelper'),
         scopeToPunc = { 'static': '.', 'inner': '~', 'instance': '#' },
-        hasOwnProperty = Object.prototype.hasOwnProperty;
+        hasOwnProp = Object.prototype.hasOwnProperty;
     
     /**
         @global
@@ -246,7 +246,7 @@
         if (moduleNames.length) {
             nav += '<h3>Modules</h3><ul>';
             moduleNames.forEach(function(m) {
-                if ( !hasOwnProperty.call(seen, m.longname) ) nav += '<li>'+linkto(m.longname, m.name)+'</li>';
+                if ( !hasOwnProp.call(seen, m.longname) ) nav += '<li>'+linkto(m.longname, m.name)+'</li>';
                 seen[m.longname] = true;
             });
             
@@ -260,7 +260,7 @@
         if (externalNames.length) {
             nav += '<h3>Externals</h3><ul>';
             externalNames.forEach(function(e) {
-                if ( !hasOwnProperty.call(seen, e.longname) ) nav += '<li>'+linkto( e.longname, e.name.replace(/(^"|"$)/g, '') )+'</li>';
+                if ( !hasOwnProp.call(seen, e.longname) ) nav += '<li>'+linkto( e.longname, e.name.replace(/(^"|"$)/g, '') )+'</li>';
                 seen[e.longname] = true;
             });
             
@@ -284,7 +284,7 @@
                     nav += '<h3>Classes</h3><ul>';
                     moduleClasses = -1;
                 }
-                if ( !hasOwnProperty.call(seen, c.longname) ) nav += '<li>'+linkto(c.longname, c.name)+'</li>';
+                if ( !hasOwnProp.call(seen, c.longname) ) nav += '<li>'+linkto(c.longname, c.name)+'</li>';
                 seen[c.longname] = true;
             });
             
@@ -298,7 +298,7 @@
         if (namespaceNames.length) {
             nav += '<h3>Namespaces</h3><ul>';
             namespaceNames.forEach(function(n) {
-                if ( !hasOwnProperty.call(seen, n.longname) ) nav += '<li>'+linkto(n.longname, n.name)+'</li>';
+                if ( !hasOwnProp.call(seen, n.longname) ) nav += '<li>'+linkto(n.longname, n.name)+'</li>';
                 seen[n.longname] = true;
             });
             
@@ -309,7 +309,7 @@
 //         if (constantNames.length) {
 //             nav += '<h3>Constants</h3><ul>';
 //             constantNames.forEach(function(c) {
-//                 if ( !hasOwnProperty.call(seen, c.longname) ) nav += '<li>'+linkto(c.longname, c.name)+'</li>';
+//                 if ( !hasOwnProp.call(seen, c.longname) ) nav += '<li>'+linkto(c.longname, c.name)+'</li>';
 //                 seen[c.longname] = true;
 //             });
 //             
@@ -323,7 +323,7 @@
         if (mixinNames.length) {
             nav += '<h3>Mixins</h3><ul>';
             mixinNames.forEach(function(m) {
-                if ( !hasOwnProperty.call(seen, m.longname) ) nav += '<li>'+linkto(m.longname, m.name)+'</li>';
+                if ( !hasOwnProp.call(seen, m.longname) ) nav += '<li>'+linkto(m.longname, m.name)+'</li>';
                 seen[m.longname] = true;
             });
             
@@ -347,7 +347,7 @@
             nav += '<h3>Global</h3><ul>';
             
             globalNames.forEach(function(g) {
-                if ( g.kind !== 'typedef' && !hasOwnProperty.call(seen, g.longname) ) nav += '<li>'+linkto(g.longname, g.name)+'</li>';
+                if ( g.kind !== 'typedef' && !hasOwnProp.call(seen, g.longname) ) nav += '<li>'+linkto(g.longname, g.name)+'</li>';
                 seen[g.longname] = true;
             });