diff --git a/‎generate/descriptor.json‎
Lines changed: 9 additions & 14 deletions b/‎generate/descriptor.json‎
Lines changed: 9 additions & 14 deletions
diff --git a/‎generate/utils.js‎
Lines changed: 12 additions & 2 deletions b/‎generate/utils.js‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎lib/index.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/index.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/tree.js‎
Lines changed: 4 additions & 2 deletions b/‎lib/tree.js‎
Lines changed: 4 additions & 2 deletions
@@ -554,9 +554,6 @@
         "git_index_add_all": {
           "ignore": true
         },
-        "git_index_add_bypath": {
-          "jsFunctionName": "addByPath"
-        },
         "git_index_conflict_get": {
           "ignore": true
         },
@@ -584,13 +581,13 @@
         "git_index_new": {
           "ignore": true
         },
-	      "git_index_read": {
-	        "args": {
-	          "force": {
-	            "isOptional": true
-	          }
-	        }
-	      },
+        "git_index_read": {
+          "args": {
+            "force": {
+              "isOptional": true
+            }
+          }
+        },
         "git_index_remove_all": {
           "ignore": true
         },
@@ -599,7 +596,7 @@
 	      },
         "git_index_update_all": {
           "ignore": true
-   	   },
+   	    },
 	      "git_index_write": {
 	        "args": {
 	          "force": {
@@ -827,7 +824,6 @@
           "ignore": true
         },
         "git_oid_fromstr": {
-          "jsFunctionName": "fromString",
           "isAsync": false
         },
         "git_oid_fromstrn": {
@@ -852,8 +848,7 @@
           "ignore": true
         },
         "git_oid_tostr": {
-          "ignore": true,
-          "jsFunctionName": "toString"
+          "ignore": true
         }
       },
       "fields": {
 
@@ -75,7 +75,18 @@ var Utils = {
   },
 
   cTypeToJsName: function(cType, ownerType) {
-    return Utils.camelCase(Utils.cTypeToCppName(cType, ownerType).replace("Git", ""));
+    var output = Utils.camelCase(Utils.cTypeToCppName(cType, ownerType).replace(/^Git/, ""));
+    var mergedPrefixes = ["from", "by"];
+
+    mergedPrefixes.forEach(function(prefix) {
+      var reg = new RegExp("(^" + prefix + "|" + Utils.titleCase(prefix) + ")([a-z]+)$");
+      output = output.replace(reg, function(all, prefixMatch, otherWord) {
+        return prefixMatch + Utils.titleCase(otherWord);
+      });
+    });
+
+    output = output.replace(/([a-z])Str$/, "$1String")
+    return output;
   },
 
   isConstructorFunction: function(cType, fnName) {
@@ -287,7 +298,6 @@ var Utils = {
     fnDef.jsFunctionName = Utils.cTypeToJsName(key, "git_" + typeDef.typeName);
     //fnDef.isAsync = false; // until proven otherwise
 
-
     if (fnDef.cppFunctionName == typeDef.cppClassName) {
       fnDef.cppFunctionName = fnDef.cppFunctionName.replace("Git", "");
     }
 
@@ -11,7 +11,7 @@ Index.prototype.entries = function() {
   var result = [];
 
   for (var i = 0; i < size; i++) {
-    result.push(this.entry(i));
+    result.push(this.getByIndex(i));
   }
 
   return result;
 
@@ -4,6 +4,7 @@ var Treebuilder = git.Treebuilder;
 var Diff = git.Diff;
 var events = require("events");
 
+var oldEntryByIndex = Tree.prototype.entryByIndex;
 // Backwards compatibility.
 Object.defineProperties(Tree.prototype, {
   "size": {
@@ -34,8 +35,9 @@ Tree.prototype.diff = function(tree, callback) {
  * @param {Number} i
  * @return {TreeEntry}
  */
+
 Tree.prototype.entryByIndex = function(i) {
-  var entry = this.entryByindex(i);
+  var entry = oldEntryByIndex.call(this, i);
   entry.parent = this;
   return entry;
 };
@@ -62,7 +64,7 @@ Tree.prototype.entryByName = function(name) {
 Tree.prototype.getEntry = function(path, callback) {
   var tree = this;
 
-  return this.entryBypath(path).then(function(entry) {
+  return this.entryByPath(path).then(function(entry) {
     entry.parent = tree;
 
     if (typeof callback === "function") {
Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ Index.prototype.entries = function() {
11	11	var result = [];
12	12
13	13	for (var i = 0; i < size; i++) {
14		- result.push(this.entry(i));
	14	+ result.push(this.getByIndex(i));
15	15	}
16	16
17	17	return result;