diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index be3c1afc2c5..2b44a10e913 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -88,7 +88,7 @@ bDeformGroup* copy_defgroup (bDeformGroup *ingroup)
 	if (!ingroup)
 		return NULL;
 
-	outgroup=MEM_callocN(sizeof(bDeformGroup), "deformGroup");
+	outgroup=MEM_callocN(sizeof(bDeformGroup), "copy deformGroup");
 	
 	/* For now, just copy everything over. */
 	memcpy (outgroup, ingroup, sizeof(bDeformGroup));
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 59394973d4e..8d53d3b5246 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -126,7 +126,7 @@ static void make_boneList(ListBase* list, ListBase *bones, EditBone *parent)
 		
 		/*	Copy relevant data from bone to eBone */
 		eBone->parent=parent;
-		strcpy (eBone->name, curBone->name);
+		BLI_strncpy (eBone->name, curBone->name, 32);
 		eBone->flag = curBone->flag;
 		
 		/* fix selection flags */
@@ -245,7 +245,7 @@ static void editbones_to_armature (ListBase *list, Object *ob)
 		newBone= MEM_callocN (sizeof(Bone), "bone");
 		eBone->temp= newBone;	/* Associate the real Bones with the EditBones */
 		
-		strcpy (newBone->name, eBone->name);
+		BLI_strncpy (newBone->name, eBone->name, 32);
 		memcpy (newBone->head, eBone->head, sizeof(float)*3);
 		memcpy (newBone->tail, eBone->tail, sizeof(float)*3);
 		newBone->flag= eBone->flag;
@@ -1166,7 +1166,7 @@ static EditBone *add_editbone(char *name)
 {
 	EditBone *bone= MEM_callocN(sizeof(EditBone), "eBone");
 	
-	strcpy (bone->name, name);
+	BLI_strncpy (bone->name, name, 32);
 	unique_editbone_name (bone->name);
 	
 	BLI_addtail(&G.edbo, bone);
@@ -1607,7 +1607,7 @@ void unique_editbone_name (char *name)
 		for (number = 1; number <=999; number++){
 			sprintf (tempname, "%s.%03d", name, number);
 			if (!editbone_name_exists(tempname)){
-				strcpy (name, tempname);
+				BLI_strncpy (name, tempname, 32);
 				return;
 			}
 		}
@@ -1703,7 +1703,7 @@ void extrude_armature(int forked)
 				
 				if(newbone->parent) newbone->flag |= BONE_CONNECTED;
 				
-				strcpy (newbone->name, ebone->name);
+				BLI_strncpy (newbone->name, ebone->name, 32);
 				
 				if(flipbone && forked) {	// only set if mirror edit
 					if(strlen(newbone->name)<30) {
@@ -2361,7 +2361,7 @@ void unique_bone_name (bArmature *arm, char *name)
 		for (number = 1; number <=999; number++){
 			sprintf (tempname, "%s.%03d", name, number);
 			if (!get_named_bone(arm, tempname)){
-				strcpy (name, tempname);
+				BLI_strncpy (name, tempname, 32);
 				return;
 			}
 		}
diff --git a/source/blender/src/editdeform.c b/source/blender/src/editdeform.c
index 36709948be9..3ae10500c72 100644
--- a/source/blender/src/editdeform.c
+++ b/source/blender/src/editdeform.c
@@ -144,14 +144,9 @@ bDeformGroup *add_defgroup_name (Object *ob, char *name)
 	if (!ob)
 		return NULL;
 	
-	defgroup = MEM_callocN (sizeof(bDeformGroup), "deformGroup");
+	defgroup = MEM_callocN (sizeof(bDeformGroup), "add deformGroup");
 
-	/* I think there should be some length
-	 * checking here -- don't know why NaN
-	 * never checks name lengths (see
-	 * unique_vertexgroup_name, for example).
-	 */
-	strcpy (defgroup->name, name);
+	BLI_strncpy (defgroup->name, name, 32);
 
 	BLI_addtail(&ob->defbase, defgroup);
 	unique_vertexgroup_name(defgroup, ob);
@@ -606,7 +601,7 @@ void unique_vertexgroup_name (bDeformGroup *dg, Object *ob)
 			}
 		}
 		if (!exists){
-			strcpy (dg->name, tempname);
+			BLI_strncpy (dg->name, tempname, 32);
 			return;
 		}
 	}	
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 517097ddcd2..1fd3abd3145 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -205,7 +205,7 @@ void join_mesh(void)
 						}
 					}
 					if (!odg){
-						odg = MEM_callocN (sizeof(bDeformGroup), "deformGroup");
+						odg = MEM_callocN (sizeof(bDeformGroup), "join deformGroup");
 						memcpy (odg, dg, sizeof(bDeformGroup));
 						BLI_addtail(&ob->defbase, odg);
 					}