diff --git a/doc/changes.txt b/doc/changes.txt
new file mode 100644
index 0000000000..f8a88dba47
--- /dev/null
+++ b/doc/changes.txt
@@ -0,0 +1,3 @@
+30-October-2013:
+================
+! addRow() renamed to addEmptyRow()
diff --git a/doc/ref/data/dyn_table_ref.yaml b/doc/ref/data/dyn_table_ref.yaml
index 1539626411..76fa978a4c 100755
--- a/doc/ref/data/dyn_table_ref.yaml
+++ b/doc/ref/data/dyn_table_ref.yaml
@@ -225,7 +225,7 @@ CATEGORIES :
         DESCR  : The cursor.
 
   - g_dyn_table_add_empty_row:
-      NAME     : addRow
+      NAME     : addEmptyRow
       SUMMARY  : *objc_typed_table_add_empty_row_summary
       DESCR    : *objc_typed_table_add_empty_row_descr
       SIGNATURE: -(TightdbCursor *)addRow
diff --git a/doc/ref/examples/ex_objc_query_dynamic_intro.m b/doc/ref/examples/ex_objc_query_dynamic_intro.m
index 0e0ed15dd2..ee331cc43b 100644
--- a/doc/ref/examples/ex_objc_query_dynamic_intro.m
+++ b/doc/ref/examples/ex_objc_query_dynamic_intro.m
@@ -26,7 +26,7 @@ int main()
         
         // Row 0
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:23 inColumn:AGE];
         [cursor setString:@"Joe" inColumn:NAME];
@@ -34,7 +34,7 @@ int main()
         
         // Row 1
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:32 inColumn:AGE];
         [cursor setString:@"Simon" inColumn:NAME];
@@ -42,7 +42,7 @@ int main()
         
         // Row 2
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:12 inColumn:AGE];
         [cursor setString:@"Steve" inColumn:NAME];
@@ -50,7 +50,7 @@ int main()
         
         // Row 3
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:59 inColumn:AGE];
         [cursor setString:@"Nick" inColumn:NAME];
diff --git a/doc/ref/examples/ex_objc_table_dynamic_intro.m b/doc/ref/examples/ex_objc_table_dynamic_intro.m
index dbaf4b2403..c2ccdb60d8 100644
--- a/doc/ref/examples/ex_objc_table_dynamic_intro.m
+++ b/doc/ref/examples/ex_objc_table_dynamic_intro.m
@@ -22,28 +22,28 @@ int main()
         
         // Row 0
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:23 inColumn:AGE];
         [cursor setString:@"Joe" inColumn:NAME];
         
         // Row 1
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:32 inColumn:AGE];
         [cursor setString:@"Simon" inColumn:NAME];
 
         // Row 2
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:12 inColumn:AGE];
         [cursor setString:@"Steve" inColumn:NAME];
         
         // Row 3
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:100 inColumn:AGE];
         [cursor setString:@"Nick" inColumn:NAME];
diff --git a/doc/ref/examples/ex_objc_table_typed_intro.m b/doc/ref/examples/ex_objc_table_typed_intro.m
index 1275d24f97..0a17b0ae66 100644
--- a/doc/ref/examples/ex_objc_table_typed_intro.m
+++ b/doc/ref/examples/ex_objc_table_typed_intro.m
@@ -20,15 +20,15 @@ int main()
 
         PeopleTable *table = [[PeopleTable alloc] init];
         
-        PeopleTable_Cursor *cursor = [table addRow];
+        PeopleTable_Cursor *cursor = [table addEmptyRow];
         cursor.Name = @"Brian";
         cursor.Age = 10;
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         cursor.Name = @"Sofie";
         cursor.Age = 40;
         
-        [table addOrInsertRowAtIndex:[table count]
+        [table insertRowAtIndex:[table count]
                                 Name:@"Jesper"
                                  Age:200];
         
diff --git a/doc/ref/examples/ex_objc_tableview_dynamic_intro.m b/doc/ref/examples/ex_objc_tableview_dynamic_intro.m
index baf11d9b80..ac4258d490 100644
--- a/doc/ref/examples/ex_objc_tableview_dynamic_intro.m
+++ b/doc/ref/examples/ex_objc_tableview_dynamic_intro.m
@@ -26,7 +26,7 @@ int main()
         
         // Row 0
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:23 inColumn:AGE];
         [cursor setString:@"Joe" inColumn:NAME];
@@ -34,7 +34,7 @@ int main()
         
         // Row 1
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:32 inColumn:AGE];
         [cursor setString:@"Simon" inColumn:NAME];
@@ -42,7 +42,7 @@ int main()
         
         // Row 2
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:12 inColumn:AGE];
         [cursor setString:@"Steve" inColumn:NAME];
@@ -50,7 +50,7 @@ int main()
         
         // Row 3
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         
         [cursor setInt:59 inColumn:AGE];
         [cursor setString:@"Nick" inColumn:NAME];
diff --git a/doc/ref/examples/ex_objc_tableview_typed_intro.m b/doc/ref/examples/ex_objc_tableview_typed_intro.m
index 9680872f1f..41c93ac3be 100644
--- a/doc/ref/examples/ex_objc_tableview_typed_intro.m
+++ b/doc/ref/examples/ex_objc_tableview_typed_intro.m
@@ -19,15 +19,15 @@ int main()
         
         // Adds rows to the table.
         
-        PeopleTable_Cursor *cursor = [table addRow];
+        PeopleTable_Cursor *cursor = [table addEmptyRow];
         cursor.Name = @"Brian";
         cursor.Age = 10;
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         cursor.Name = @"Sofie";
         cursor.Age = 40;
         
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         cursor.Name = @"Sam";
         cursor.Age = 76;
         
diff --git a/src/tightdb/objc/table.h b/src/tightdb/objc/table.h
index bfd29fe3bc..528fcda368 100644
--- a/src/tightdb/objc/table.h
+++ b/src/tightdb/objc/table.h
@@ -116,12 +116,12 @@
 -(TightdbSpec *)getSpecWithError:(NSError *__autoreleasing *)error;
 -(BOOL)isEmpty;
 -(size_t)count;
--(TightdbCursor *)addRow;
+-(TightdbCursor *)addEmptyRow;
 
 // Only curser based add should be public. This is just a temporaray way to hide the methods.
 // TODO: Move to class extension.
--(size_t)_addRow;
--(size_t)_addRows:(size_t)rowCount;
+-(size_t)_addEmptyRow;
+-(size_t)_addEmptyRows:(size_t)rowCount;
 
 -(BOOL)clear;
 -(BOOL)clearWithError:(NSError *__autoreleasing *)error;
@@ -135,8 +135,8 @@
 
 -(TightdbCursor *)insertRowAtIndex:(size_t)ndx;
 
--(BOOL)insertRow:(size_t)ndx;
--(BOOL)insertRow:(size_t)ndx error:(NSError *__autoreleasing *)error;
+-(BOOL)insertEmptyRow:(size_t)ndx;
+-(BOOL)insertEmptyRow:(size_t)ndx error:(NSError *__autoreleasing *)error;
 
 -(void)setInt:(int64_t)value inColumn:(size_t)col_ndx atRow:(size_t)row_ndx;
 -(void)setBool:(BOOL)value inColumn:(size_t)col_ndx atRow:(size_t)row_ndx;
diff --git a/src/tightdb/objc/table_objc.mm b/src/tightdb/objc/table_objc.mm
index c3516f78a9..261819daa7 100644
--- a/src/tightdb/objc/table_objc.mm
+++ b/src/tightdb/objc/table_objc.mm
@@ -646,12 +646,12 @@ -(size_t)count
     return _table->size();
 }
 
--(TightdbCursor *)addRow
+-(TightdbCursor *)addEmptyRow
 {
-    return [[TightdbCursor alloc] initWithTable:self ndx:[self _addRow]];
+    return [[TightdbCursor alloc] initWithTable:self ndx:[self _addEmptyRow]];
 }
 
--(size_t)_addRow
+-(size_t)_addEmptyRow
 { 
     // TODO: Use a macro or er function for error handling
 
@@ -677,7 +677,7 @@ -(size_t)_addRow
 }
 
 
--(size_t)_addRows:(size_t)rowCount
+-(size_t)_addEmptyRows:(size_t)rowCount
 {
     // TODO: Use a macro or er function for error handling
 
@@ -717,16 +717,16 @@ -(TightdbCursor *)cursorAtLastIndex
 
 -(TightdbCursor *)insertRowAtIndex:(size_t)ndx
 {
-    [self insertRow:ndx];
+    [self insertEmptyRow:ndx];
     return [[TightdbCursor alloc] initWithTable:self ndx:ndx];
 }
 
--(BOOL)insertRow:(size_t)ndx 
+-(BOOL)insertEmptyRow:(size_t)ndx
 {   
-    return [self insertRow:ndx error:nil];
+    return [self insertEmptyRow:ndx error:nil];
 }
 
--(BOOL)insertRow:(size_t)ndx error:(NSError *__autoreleasing *)error
+-(BOOL)insertEmptyRow:(size_t)ndx error:(NSError *__autoreleasing *)error
 {
     if (_readOnly) {
         if (error)
diff --git a/src/tightdb/objc/test/functional.m b/src/tightdb/objc/test/functional.m
index 01dcd81edc..0cff4542d4 100644
--- a/src/tightdb/objc/test/functional.m
+++ b/src/tightdb/objc/test/functional.m
@@ -33,7 +33,7 @@ - (void)testTypedCursor
     
     // Add rows
     for (int i = 0; i < TABLE_SIZE; i++) {
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         cursor.Name = [@"Person_" stringByAppendingString: [NSString stringWithFormat:@"%d",i]];
         cursor.Age = i;
         cursor.Hired = i%2 == 0;
@@ -162,7 +162,7 @@ - (void)testDynamicCursor
     
     // Add rows
     for (int i = 0; i < TABLE_SIZE; i++) {
-        cursor = [table addRow];
+        cursor = [table addEmptyRow];
         [cursor setString:[@"Person_" stringByAppendingString: [NSString stringWithFormat:@"%d",i]] inColumn:NAME];
         [cursor setInt:i inColumn:AGE];
         [cursor setBool:i%2 == 0 inColumn:HIRED];
diff --git a/src/tightdb/objc/test/group_misc_2.m b/src/tightdb/objc/test/group_misc_2.m
index d5aede9a26..411ebe03c5 100644
--- a/src/tightdb/objc/test/group_misc_2.m
+++ b/src/tightdb/objc/test/group_misc_2.m
@@ -216,17 +216,17 @@ - (void)testSubtables
     int COL_SUBTABLE_INT = 0;
 
     // Add a row to the top level table
-    [table addRow];
+    [table addEmptyRow];
     [table setInt:700 inColumn:COL_TABLE_INT atRow:0];
 
     // Add two rows to the subtable
     
     TightdbTable *subtable = [table getTableInColumn:COL_TABLE_TAB atRow:0];
 
-    [subtable addRow];
+    [subtable addEmptyRow];
 
     [subtable setInt:800 inColumn:COL_SUBTABLE_INT atRow:0];
-    [subtable addRow];
+    [subtable addEmptyRow];
     [subtable setInt:801 inColumn:COL_SUBTABLE_INT atRow:1];
 
     // Make the mixed values column contain another subtable
diff --git a/src/tightdb/objc/test/query.m b/src/tightdb/objc/test/query.m
index 8e3c5ac9cf..8383879117 100644
--- a/src/tightdb/objc/test/query.m
+++ b/src/tightdb/objc/test/query.m
@@ -168,7 +168,7 @@ - (void) testDynamic
         TightdbBinary *bin2 = [[TightdbBinary alloc] initWithData:bin size:sizeof bin];
         
         // Using private method just for the sake of testing the setters below.
-        [table _addRows:2];
+        [table _addEmptyRows:2];
 
         [table setBool:YES inColumn:BOOL_COL atRow:0];
         [table setBool:NO inColumn:BOOL_COL atRow:1];
@@ -255,7 +255,7 @@ - (void)testFind
 {
 	TightdbTable *table = [[TightdbTable alloc]init];
 	[table addColumnWithType:tightdb_Int andName:@"IntCol"];
-	[table _addRows:6];
+	[table _addEmptyRows:6];
 
     [table setInt:10 inColumn:0 atRow:0];
     [table setInt:42 inColumn:0 atRow:1];
diff --git a/src/tightdb/objc/test/table.m b/src/tightdb/objc/test/table.m
index ff2ab25749..e4c91ab973 100644
--- a/src/tightdb/objc/test/table.m
+++ b/src/tightdb/objc/test/table.m
@@ -49,7 +49,7 @@ - (void)testTable
     //[_table set:0 ndx:ndx value:0];
     //[_table set:1 ndx:ndx value:10];
 
-    TightdbCursor *cursor = [_table addRow];
+    TightdbCursor *cursor = [_table addEmptyRow];
     size_t ndx = [cursor index];
     [cursor setInt:0 inColumn:0];
     [cursor setInt:10 inColumn:1];
@@ -94,12 +94,12 @@ - (void)testDataTypes_Typed
 
     TestTableAllTypes_Cursor *c;
 
-    c = [table addRow];
+    c = [table addEmptyRow];
 
         c.BoolCol   = NO   ; c.IntCol  = 54 ; c.FloatCol = 0.7     ; c.DoubleCol = 0.8     ; c.StringCol = @"foo";
         c.BinaryCol = bin1 ; c.DateCol = 0  ; c.TableCol = subtab1     ; c.MixedCol  = mixInt1 ;
 
-    c = [table addRow];
+    c = [table addEmptyRow];
 
         c.BoolCol   = YES  ; c.IntCol  = 506     ; c.FloatCol = 7.7         ; c.DoubleCol = 8.8       ; c.StringCol = @"banach";
         c.BinaryCol = bin2 ; c.DateCol = timeNow ; c.TableCol = subtab2     ; c.MixedCol  = mixSubtab ;
@@ -193,12 +193,12 @@ - (void)testDataTypes_Dynamic
     
     
     
-    cursor = [subtab1 addRow];
+    cursor = [subtab1 addEmptyRow];
     [cursor setInt:200 inColumn:0];
     
     
     
-    cursor = [subtab2 addRow];
+    cursor = [subtab2 addEmptyRow];
     [cursor setInt:100 inColumn:0];
     
     
@@ -210,7 +210,7 @@ - (void)testDataTypes_Dynamic
     
     
     
-    c = [table addRow];
+    c = [table addEmptyRow];
     
     
     
@@ -224,7 +224,7 @@ - (void)testDataTypes_Dynamic
     [c setTable:   subtab1   inColumn:TableCol];
     [c setMixed:   mixInt1   inColumn:MixedCol];
 
-    c = [table addRow];
+    c = [table addEmptyRow];
     
     [c setBool:    YES       inColumn:BoolCol];
     [c setInt:     506       inColumn:IntCol];
diff --git a/src/tightdb/objc/tightdb.h b/src/tightdb/objc/tightdb.h
index 25ab2edc4e..b33ae09f41 100644
--- a/src/tightdb/objc/tightdb.h
+++ b/src/tightdb/objc/tightdb.h
@@ -55,7 +55,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName1, CType1) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -172,9 +172,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName1, CType1) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -263,7 +263,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName2, CType2) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -391,9 +391,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName2, CType2) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -488,7 +488,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName3, CType3) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -627,9 +627,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName3, CType3) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -730,7 +730,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName4, CType4) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -880,9 +880,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName4, CType4) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -989,7 +989,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName5, CType5) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -1150,9 +1150,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName5, CType5) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -1265,7 +1265,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName6, CType6) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -1437,9 +1437,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName6, CType6) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -1558,7 +1558,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName7, CType7) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -1741,9 +1741,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName7, CType7) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -1868,7 +1868,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName8, CType8) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -2062,9 +2062,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName8, CType8) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -2195,7 +2195,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName9, CType9) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -2400,9 +2400,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName9, CType9) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -2539,7 +2539,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName10, CType10) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -2755,9 +2755,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName10, CType10) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -2900,7 +2900,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName11, CType11) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -3127,9 +3127,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName11, CType11) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -3278,7 +3278,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName12, CType12) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -3516,9 +3516,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName12, CType12) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -3673,7 +3673,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName13, CType13) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12 CName13:(TIGHTDB_ARG_TYPE(CType13))CName13; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12 CName13:(TIGHTDB_ARG_TYPE(CType13))CName13; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -3922,9 +3922,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName13, CType13) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -4085,7 +4085,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName14, CType14) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12 CName13:(TIGHTDB_ARG_TYPE(CType13))CName13 CName14:(TIGHTDB_ARG_TYPE(CType14))CName14; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12 CName13:(TIGHTDB_ARG_TYPE(CType13))CName13 CName14:(TIGHTDB_ARG_TYPE(CType14))CName14; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -4345,9 +4345,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName14, CType14) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
@@ -4514,7 +4514,7 @@ TIGHTDB_COLUMN_PROXY_DEF(CName15, CType15) \
 -(void)add##CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12 CName13:(TIGHTDB_ARG_TYPE(CType13))CName13 CName14:(TIGHTDB_ARG_TYPE(CType14))CName14 CName15:(TIGHTDB_ARG_TYPE(CType15))CName15; \
 -(void)insertRowAtIndex:(size_t)ndx CName1:(TIGHTDB_ARG_TYPE(CType1))CName1 CName2:(TIGHTDB_ARG_TYPE(CType2))CName2 CName3:(TIGHTDB_ARG_TYPE(CType3))CName3 CName4:(TIGHTDB_ARG_TYPE(CType4))CName4 CName5:(TIGHTDB_ARG_TYPE(CType5))CName5 CName6:(TIGHTDB_ARG_TYPE(CType6))CName6 CName7:(TIGHTDB_ARG_TYPE(CType7))CName7 CName8:(TIGHTDB_ARG_TYPE(CType8))CName8 CName9:(TIGHTDB_ARG_TYPE(CType9))CName9 CName10:(TIGHTDB_ARG_TYPE(CType10))CName10 CName11:(TIGHTDB_ARG_TYPE(CType11))CName11 CName12:(TIGHTDB_ARG_TYPE(CType12))CName12 CName13:(TIGHTDB_ARG_TYPE(CType13))CName13 CName14:(TIGHTDB_ARG_TYPE(CType14))CName14 CName15:(TIGHTDB_ARG_TYPE(CType15))CName15; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -4785,9 +4785,9 @@ TIGHTDB_COLUMN_PROXY_IMPL(CName15, CType15) \
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \
diff --git a/src/tightdb/objc/tightdb.h.cheetah b/src/tightdb/objc/tightdb.h.cheetah
index efad19b232..ed0caa9327 100644
--- a/src/tightdb/objc/tightdb.h.cheetah
+++ b/src/tightdb/objc/tightdb.h.cheetah
@@ -90,7 +90,7 @@ CName${j+1}:(TIGHTDB_ARG_TYPE(CType${j+1}))CName${j+1}%slurp
 %end for
 ; \
 -(TableName##_Query *)where; \
--(TableName##_Cursor *)addRow; \
+-(TableName##_Cursor *)addEmptyRow; \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx; \
 -(TableName##_Cursor *)cursorAtLastIndex; \
 -(TableName##_Cursor *)insertRowAtIndex:(size_t)ndx; \
@@ -241,9 +241,9 @@ CName${j+1}:(TIGHTDB_ARG_TYPE(CType${j+1}))CName${j+1} %slurp
 { \
     return [[TableName##_Query alloc] initWithTable:self]; \
 } \
--(TableName##_Cursor *)addRow \
+-(TableName##_Cursor *)addEmptyRow \
 { \
-    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addRow]]; \
+    return [[TableName##_Cursor alloc] initWithTable:self ndx:[super _addEmptyRow]]; \
 } \
 -(TableName##_Cursor *)cursorAtIndex:(size_t)ndx \
 { \