diff --git a/source/blender/python/bmesh/bmesh_py_types_select.cc b/source/blender/python/bmesh/bmesh_py_types_select.cc
index 794ddc679e3..716f0941a25 100644
--- a/source/blender/python/bmesh/bmesh_py_types_select.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_select.cc
@@ -306,8 +306,8 @@ static PySequenceMethods bpy_bmeditselseq_as_sequence = {
     /*sq_repeat*/ nullptr,
     /* Only set this so `PySequence_Check()` returns True. */
     /*sq_item*/ (ssizeargfunc)bpy_bmeditselseq_subscript_int,
-    /*sq_slice */ nullptr,
-    /*sq_ass_item */ nullptr,
+    /*was_sq_slice*/ nullptr,
+    /*sq_ass_item*/ nullptr,
     /*was_sq_ass_slice*/ nullptr,
     /*sq_contains*/ (objobjproc)bpy_bmeditselseq_contains,
     /*sq_inplace_concat*/ nullptr,
diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
index b978dd55680..c9fde0fcf9b 100644
--- a/source/blender/python/intern/bpy_rna.cc
+++ b/source/blender/python/intern/bpy_rna.cc
@@ -3425,7 +3425,7 @@ static PySequenceMethods pyrna_prop_array_as_sequence = {
     /*sq_repeat*/ nullptr,
     /* Only set this so `PySequence_Check()` returns True. */
     /*sq_item*/ (ssizeargfunc)pyrna_prop_array_subscript_int,
-    /*sq_slice*/ nullptr,
+    /*was_sq_slice*/ nullptr, /* DEPRECATED. */
     /*sq_ass_item*/ (ssizeobjargproc)prop_subscript_ass_array_int,
     /*was_sq_ass_slice*/ nullptr, /* DEPRECATED. */
     /*sq_contains*/ (objobjproc)pyrna_prop_array_contains,
@@ -3455,7 +3455,7 @@ static PySequenceMethods pyrna_struct_as_sequence = {
     /* Only set this so `PySequence_Check()` returns True. */
     /*sq_item*/ nullptr,
     /*was_sq_slice*/ nullptr, /* DEPRECATED. */
-    /*sq_ass_item */ nullptr,
+    /*sq_ass_item*/ nullptr,
     /*was_sq_ass_slice*/ nullptr, /* DEPRECATED. */
     /*sq_contains*/ (objobjproc)pyrna_struct_contains,
     /*sq_inplace_concat*/ nullptr,
diff --git a/source/blender/python/mathutils/mathutils_Color.cc b/source/blender/python/mathutils/mathutils_Color.cc
index 01ea999bfa6..ace03d82536 100644
--- a/source/blender/python/mathutils/mathutils_Color.cc
+++ b/source/blender/python/mathutils/mathutils_Color.cc
@@ -855,9 +855,9 @@ static PyNumberMethods Color_NumMethods = {
     /*nb_divmod*/ nullptr,
     /*nb_power*/ nullptr,
     /*nb_negative*/ (unaryfunc)Color_neg,
-    /*tp_positive*/ (unaryfunc)Color_copy,
-    /*tp_absolute*/ nullptr,
-    /*tp_bool*/ nullptr,
+    /*nb_positive*/ (unaryfunc)Color_copy,
+    /*nb_absolute*/ nullptr,
+    /*nb_bool*/ nullptr,
     /*nb_invert*/ nullptr,
     /*nb_lshift*/ nullptr,
     /*nb_rshift*/ nullptr,
diff --git a/source/blender/python/mathutils/mathutils_Matrix.cc b/source/blender/python/mathutils/mathutils_Matrix.cc
index 3ae35132cc4..9e980b10efe 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.cc
+++ b/source/blender/python/mathutils/mathutils_Matrix.cc
@@ -3000,9 +3000,9 @@ static PyNumberMethods Matrix_NumMethods = {
     /*nb_divmod*/ nullptr,
     /*nb_power*/ nullptr,
     /*nb_negative*/ nullptr,
-    /*tp_positive*/ nullptr,
-    /*tp_absolute*/ nullptr,
-    /*tp_bool*/ nullptr,
+    /*nb_positive*/ nullptr,
+    /*nb_absolute*/ nullptr,
+    /*nb_bool*/ nullptr,
     /*nb_invert*/ (unaryfunc)Matrix_inverted_noargs,
     /*nb_lshift*/ nullptr,
     /*nb_rshift*/ nullptr,
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.cc b/source/blender/python/mathutils/mathutils_Quaternion.cc
index 30ab64c2390..22943c4d1ea 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.cc
+++ b/source/blender/python/mathutils/mathutils_Quaternion.cc
@@ -1376,9 +1376,9 @@ static PyNumberMethods Quaternion_NumMethods = {
     /*nb_divmod*/ nullptr,
     /*nb_power*/ nullptr,
     /*nb_negative*/ (unaryfunc)Quaternion_neg,
-    /*tp_positive*/ (unaryfunc)Quaternion_copy,
-    /*tp_absolute*/ nullptr,
-    /*tp_bool*/ nullptr,
+    /*nb_positive*/ (unaryfunc)Quaternion_copy,
+    /*nb_absolute*/ nullptr,
+    /*nb_bool*/ nullptr,
     /*nb_invert*/ nullptr,
     /*nb_lshift*/ nullptr,
     /*nb_rshift*/ nullptr,
diff --git a/source/blender/python/mathutils/mathutils_Vector.cc b/source/blender/python/mathutils/mathutils_Vector.cc
index c91e1515d28..f579a96949d 100644
--- a/source/blender/python/mathutils/mathutils_Vector.cc
+++ b/source/blender/python/mathutils/mathutils_Vector.cc
@@ -2407,8 +2407,8 @@ static PySequenceMethods Vector_SeqMethods = {
     /*sq_ass_item*/ (ssizeobjargproc)Vector_ass_item,
     /*was_sq_ass_slice*/ nullptr, /* DEPRECATED. */
     /*sq_contains*/ nullptr,
-    /*sq_inplace_concat */ nullptr,
-    /*sq_inplace_repeat */ nullptr,
+    /*sq_inplace_concat*/ nullptr,
+    /*sq_inplace_repeat*/ nullptr,
 };
 
 static PyMappingMethods Vector_AsMapping = {
@@ -2425,9 +2425,9 @@ static PyNumberMethods Vector_NumMethods = {
     /*nb_divmod*/ nullptr,
     /*nb_power*/ nullptr,
     /*nb_negative*/ (unaryfunc)Vector_neg,
-    /*tp_positive*/ (unaryfunc)Vector_copy,
-    /*tp_absolute*/ nullptr,
-    /*tp_bool*/ nullptr,
+    /*nb_positive*/ (unaryfunc)Vector_copy,
+    /*nb_absolute*/ nullptr,
+    /*nb_bool*/ nullptr,
     /*nb_invert*/ nullptr,
     /*nb_lshift*/ nullptr,
     /*nb_rshift*/ nullptr,
diff --git a/source/blender/shader_fx/intern/FX_shader_blur.cc b/source/blender/shader_fx/intern/FX_shader_blur.cc
index 6df4d50f6e9..fe16216d4fe 100644
--- a/source/blender/shader_fx/intern/FX_shader_blur.cc
+++ b/source/blender/shader_fx/intern/FX_shader_blur.cc
@@ -66,8 +66,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Blur = {
     /*name*/ N_("Blur"),
-    /*structName*/ "BlurShaderFxData",
-    /*structSize*/ sizeof(BlurShaderFxData),
+    /*struct_name*/ "BlurShaderFxData",
+    /*struct_size*/ sizeof(BlurShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.cc b/source/blender/shader_fx/intern/FX_shader_colorize.cc
index 3f3f56a8609..04ecb8cbf40 100644
--- a/source/blender/shader_fx/intern/FX_shader_colorize.cc
+++ b/source/blender/shader_fx/intern/FX_shader_colorize.cc
@@ -73,8 +73,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Colorize = {
     /*name*/ N_("Colorize"),
-    /*structName*/ "ColorizeShaderFxData",
-    /*structSize*/ sizeof(ColorizeShaderFxData),
+    /*struct_name*/ "ColorizeShaderFxData",
+    /*struct_size*/ sizeof(ColorizeShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_flip.cc b/source/blender/shader_fx/intern/FX_shader_flip.cc
index 60c33e59e85..20a972ab10f 100644
--- a/source/blender/shader_fx/intern/FX_shader_flip.cc
+++ b/source/blender/shader_fx/intern/FX_shader_flip.cc
@@ -63,8 +63,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Flip = {
     /*name*/ N_("Flip"),
-    /*structName*/ "FlipShaderFxData",
-    /*structSize*/ sizeof(FlipShaderFxData),
+    /*struct_name*/ "FlipShaderFxData",
+    /*struct_size*/ sizeof(FlipShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_glow.cc b/source/blender/shader_fx/intern/FX_shader_glow.cc
index 16c4ac369ae..e20d5fcecfc 100644
--- a/source/blender/shader_fx/intern/FX_shader_glow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_glow.cc
@@ -84,8 +84,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Glow = {
     /*name*/ N_("Glow"),
-    /*structName*/ "GlowShaderFxData",
-    /*structSize*/ sizeof(GlowShaderFxData),
+    /*struct_name*/ "GlowShaderFxData",
+    /*struct_size*/ sizeof(GlowShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.cc b/source/blender/shader_fx/intern/FX_shader_pixel.cc
index b70fc859ef6..06f6dda90bd 100644
--- a/source/blender/shader_fx/intern/FX_shader_pixel.cc
+++ b/source/blender/shader_fx/intern/FX_shader_pixel.cc
@@ -64,8 +64,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Pixel = {
     /*name*/ N_("Pixelate"),
-    /*structName*/ "PixelShaderFxData",
-    /*structSize*/ sizeof(PixelShaderFxData),
+    /*struct_name*/ "PixelShaderFxData",
+    /*struct_size*/ sizeof(PixelShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_rim.cc b/source/blender/shader_fx/intern/FX_shader_rim.cc
index a542698193f..801b0f5880f 100644
--- a/source/blender/shader_fx/intern/FX_shader_rim.cc
+++ b/source/blender/shader_fx/intern/FX_shader_rim.cc
@@ -91,8 +91,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Rim = {
     /*name*/ N_("Rim"),
-    /*structName*/ "RimShaderFxData",
-    /*structSize*/ sizeof(RimShaderFxData),
+    /*struct_name*/ "RimShaderFxData",
+    /*struct_size*/ sizeof(RimShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.cc b/source/blender/shader_fx/intern/FX_shader_shadow.cc
index 8db8740ee9c..b276d5065ee 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.cc
@@ -161,8 +161,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Shadow = {
     /*name*/ N_("Shadow"),
-    /*structName*/ "ShadowShaderFxData",
-    /*structSize*/ sizeof(ShadowShaderFxData),
+    /*struct_name*/ "ShadowShaderFxData",
+    /*struct_size*/ sizeof(ShadowShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.cc b/source/blender/shader_fx/intern/FX_shader_swirl.cc
index 84fd8381371..5e08e305018 100644
--- a/source/blender/shader_fx/intern/FX_shader_swirl.cc
+++ b/source/blender/shader_fx/intern/FX_shader_swirl.cc
@@ -92,8 +92,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Swirl = {
     /*name*/ N_("Swirl"),
-    /*structName*/ "SwirlShaderFxData",
-    /*structSize*/ sizeof(SwirlShaderFxData),
+    /*struct_name*/ "SwirlShaderFxData",
+    /*struct_size*/ sizeof(SwirlShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),
 
diff --git a/source/blender/shader_fx/intern/FX_shader_wave.cc b/source/blender/shader_fx/intern/FX_shader_wave.cc
index 8de832c41cb..a1f369a5c75 100644
--- a/source/blender/shader_fx/intern/FX_shader_wave.cc
+++ b/source/blender/shader_fx/intern/FX_shader_wave.cc
@@ -65,8 +65,8 @@ static void panelRegister(ARegionType *region_type)
 
 ShaderFxTypeInfo shaderfx_Type_Wave = {
     /*name*/ N_("WaveDistortion"),
-    /*structName*/ "WaveShaderFxData",
-    /*structSize*/ sizeof(WaveShaderFxData),
+    /*struct_name*/ "WaveShaderFxData",
+    /*struct_size*/ sizeof(WaveShaderFxData),
     /*type*/ eShaderFxType_GpencilType,
     /*flags*/ ShaderFxTypeFlag(0),