1 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 52c693efc84..b3c348a330c 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -96,7 +96,7 @@ int remdoubles_face_overlaps(BMesh *bm, BMVert **varr,
 }
 #endif
 
-void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
+void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter iter, liter;
 	BMVert *v, *v2;
@@ -227,7 +227,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 		}
 	}
 
-	BMO_op_callf(bm, "del geom=%fvef context=%i", ELE_DEL, DEL_ONLYTAGGED);
+	BMO_op_callf(bm, "delete geom=%fvef context=%i", ELE_DEL, DEL_ONLYTAGGED);
 
 	BLI_array_free(edges);
 	BLI_array_free(loops);
@@ -301,7 +301,7 @@ void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
 	}
 }
 
-void bmo_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
+void bmo_average_vert_facedata_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
@@ -345,10 +345,10 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
 	BMVert *v, *snapv = NULL;
 	float vec[3];
 	
-	BMO_slot_vec_get(op, "mergeco", vec);
+	BMO_slot_vec_get(op, "merge_co", vec);
 
 	//BMO_op_callf(bm, "collapse_uvs edges=%s", op, "edges");
-	BMO_op_init(bm, &weldop, "weldverts");
+	BMO_op_init(bm, &weldop, "weld_verts");
 	
 	BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
 		if (!snapv) {
@@ -375,7 +375,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op)
 	int i, tot;
 	
 	BMO_op_callf(bm, "collapse_uvs edges=%s", op, "edges");
-	BMO_op_init(bm, &weldop, "weldverts");
+	BMO_op_init(bm, &weldop, "weld_verts");
 
 	BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK);
 
@@ -487,7 +487,7 @@ void bmo_collapse_uvs_exec(BMesh *bm, BMOperator *op)
 	}
 }
 
-void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, const char *targetmapname)
+void bmesh_find_doubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, const char *targetmapname)
 {
 	BMOIter oiter;
 	BMVert *v, *v2;
@@ -505,17 +505,17 @@ void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, c
 		verts[i++] = v;
 	}
 
-	/* Test whether keepverts arg exists and is non-empty */
-	if (BMO_slot_exists(op, "keepverts")) {
-		keepvert = BMO_iter_new(&oiter, bm, op, "keepverts", BM_VERT) != NULL;
+	/* Test whether keep_verts arg exists and is non-empty */
+	if (BMO_slot_exists(op, "keep_verts")) {
+		keepvert = BMO_iter_new(&oiter, bm, op, "keep_verts", BM_VERT) != NULL;
 	}
 
 	/* sort by vertex coordinates added together */
 	qsort(verts, BLI_array_count(verts), sizeof(void *), vergaverco);
 
-	/* Flag keepverts */
+	/* Flag keep_verts */
 	if (keepvert) {
-		BMO_slot_buffer_flag_enable(bm, op, "keepverts", BM_VERT, VERT_KEEP);
+		BMO_slot_buffer_flag_enable(bm, op, "keep_verts", BM_VERT, VERT_KEEP);
 	}
 
 	len = BLI_array_count(verts);
@@ -557,20 +557,20 @@ void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, c
 	BLI_array_free(verts);
 }
 
-void bmo_removedoubles_exec(BMesh *bm, BMOperator *op)
+void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator weldop;
 
-	BMO_op_init(bm, &weldop, "weldverts");
-	bmesh_finddoubles_common(bm, op, &weldop, "targetmap");
+	BMO_op_init(bm, &weldop, "weld_verts");
+	bmesh_find_doubles_common(bm, op, &weldop, "targetmap");
 	BMO_op_exec(bm, &weldop);
 	BMO_op_finish(bm, &weldop);
 }
 
 
-void bmo_finddoubles_exec(BMesh *bm, BMOperator *op)
+void bmo_find_doubles_exec(BMesh *bm, BMOperator *op)
 {
-	bmesh_finddoubles_common(bm, op, op, "targetmapout");
+	bmesh_find_doubles_common(bm, op, op, "targetmapout");
 }
 
 void bmo_automerge_exec(BMesh *bm, BMOperator *op)
@@ -591,12 +591,12 @@ void bmo_automerge_exec(BMesh *bm, BMOperator *op)
 
 	/* Search for doubles among all vertices, but only merge non-VERT_KEEP
 	 * vertices into VERT_KEEP vertices. */
-	BMO_op_initf(bm, &findop, "finddoubles verts=%av keepverts=%fv", VERT_KEEP);
+	BMO_op_initf(bm, &findop, "find_doubles verts=%av keep_verts=%fv", VERT_KEEP);
 	BMO_slot_copy(op, &findop, "dist", "dist");
 	BMO_op_exec(bm, &findop);
 
 	/* weld the vertices */
-	BMO_op_init(bm, &weldop, "weldverts");
+	BMO_op_init(bm, &weldop, "weld_verts");
 	BMO_slot_copy(&findop, &weldop, "targetmapout", "targetmap");
 	BMO_op_exec(bm, &weldop);