2 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index e9ecde19574..8ac0f71cd7e 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1611,10 +1611,10 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
      layerInterp_mvert_skin,
      NULL,
      layerDefault_mvert_skin},
-    /* 37: CD_LANPR_EDGE */
-    {sizeof(LanprEdge), "LanprEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL},
-    /* 38: CD_LANPR_FACE */
-    {sizeof(LanprFace), "LanprFace", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+    /* 37: CD_FREESTYLE_EDGE */
+    {sizeof(FreestyleEdge), "FreestyleEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+    /* 38: CD_FREESTYLE_FACE */
+    {sizeof(FreestyleFace), "FreestyleFace", 1, NULL, NULL, NULL, NULL, NULL, NULL},
     /* 39: CD_MLOOPTANGENT */
     {sizeof(float[4]), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
     /* 40: CD_TESSLOOPNORMAL */
@@ -1663,8 +1663,8 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
     "CDPaintMask",
     /* 35-36 */ "CDGridPaintMask",
     "CDMVertSkin",
-    /* 37-38 */ "CDLanprEdge",
-    "CDLanprFace",
+    /* 37-38 */ "CDFreestyleEdge",
+    "CDFreestyleFace",
     /* 39-41 */ "CDMLoopTangent",
     "CDTessLoopNormal",
     "CDCustomLoopNormal",
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 3dc025bdcf2..0414c6d0a02 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -222,14 +222,14 @@ int BKE_object_data_transfer_dttype_to_cdtype(const int dtdata_type)
     case DT_TYPE_BWEIGHT_EDGE:
       return CD_FAKE_BWEIGHT;
     case DT_TYPE_FREESTYLE_EDGE:
-      return CD_LANPR_EDGE;
+      return CD_FREESTYLE_EDGE;
 
     case DT_TYPE_UV:
       return CD_FAKE_UV;
     case DT_TYPE_SHARP_FACE:
       return CD_FAKE_SHARP;
     case DT_TYPE_FREESTYLE_FACE:
-      return CD_LANPR_FACE;
+      return CD_FREESTYLE_FACE;
 
     case DT_TYPE_VCOL:
       return CD_MLOOPCOL;
@@ -519,11 +519,11 @@ static void data_transfer_layersmapping_add_item_cd(ListBase *r_map,
 {
   uint64_t data_flag = 0;
 
-  if (cddata_type == CD_LANPR_EDGE) {
-    data_flag = LANPR_EDGE_MARK;
+  if (cddata_type == CD_FREESTYLE_EDGE) {
+    data_flag = FREESTYLE_EDGE_MARK;
   }
-  else if (cddata_type == CD_LANPR_FACE) {
-    data_flag = LANPR_FACE_MARK;
+  else if (cddata_type == CD_FREESTYLE_FACE) {
+    data_flag = FREESTYLE_FACE_MARK;
   }
 
   data_transfer_layersmapping_add_item(r_map,