diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 12b649c362d..94e8b7163fb 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -60,28 +60,28 @@ app_sources = env.Glob(prefix + '/*.cpp')
 prefix = 'intern/python'
 # python_sources = env.Glob(prefix + '/*.cpp')
 python_sources = [
-					prefix + '/Freestyle.cpp',
-					prefix + '/Convert.cpp',
-					prefix + '/BinaryPredicate0D.cpp',
-					prefix + '/BinaryPredicate1D.cpp',
-					prefix + '/Id.cpp',
-					prefix + '/IntegrationType.cpp',
-					prefix + '/Interface0D.cpp',
-					prefix + '/Interface0D/CurvePoint.cpp',
-					prefix + '/Interface0D/CurvePoint/StrokeVertex.cpp',
-					prefix + '/Interface0D/SVertex.cpp',
-					prefix + '/Interface0D/ViewVertex.cpp',
-					prefix + '/Interface1D.cpp',
-					prefix + '/Interface1D/FEdge.cpp',
-					prefix + '/Interface1D/Stroke.cpp',
-					prefix + '/Nature.cpp',
-					prefix + '/MediumType.cpp',
-					prefix + '/StrokeAttribute.cpp',
-					prefix + '/StrokeShader.cpp',
-					prefix + '/UnaryFunction0D.cpp',
-					prefix + '/UnaryFunction1D.cpp',
-					prefix + '/UnaryPredicate0D.cpp',
-					prefix + '/UnaryPredicate1D.cpp',
+					prefix + '/BPy_Freestyle.cpp',
+					prefix + '/BPy_Convert.cpp',
+					prefix + '/BPy_BinaryPredicate0D.cpp',
+					prefix + '/BPy_BinaryPredicate1D.cpp',
+					prefix + '/BPy_Id.cpp',
+					prefix + '/BPy_IntegrationType.cpp',
+					prefix + '/BPy_Interface0D.cpp',
+					prefix + '/Interface0D/BPy_CurvePoint.cpp',
+					prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
+					prefix + '/Interface0D/BPy_SVertex.cpp',
+					prefix + '/Interface0D/BPy_ViewVertex.cpp',
+					prefix + '/BPy_Interface1D.cpp',
+					prefix + '/Interface1D/BPy_FEdge.cpp',
+					prefix + '/Interface1D/BPy_Stroke.cpp',
+					prefix + '/BPy_MediumType.cpp',
+					prefix + '/BPy_Nature.cpp',
+					prefix + '/BPy_StrokeAttribute.cpp',
+					prefix + '/BPy_StrokeShader.cpp',
+					prefix + '/BPy_UnaryFunction0D.cpp',
+					prefix + '/BPy_UnaryFunction1D.cpp',
+					prefix + '/BPy_UnaryPredicate0D.cpp',
+					prefix + '/BPy_UnaryPredicate1D.cpp',
 				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index 67358c65bbf..9c3247b30b8 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -1,7 +1,7 @@
-#include "BinaryPredicate0D.h"
+#include "BPy_BinaryPredicate0D.h"
 
-#include "Convert.h"
-#include "Interface0D.h"
+#include "BPy_Convert.h"
+#include "BPy_Interface0D.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate0D.h
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index bf2772ecdcc..9dd2bd19204 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -1,7 +1,7 @@
-#include "BinaryPredicate1D.h"
+#include "BPy_BinaryPredicate1D.h"
 
-#include "Convert.h"
-#include "Interface1D.h"
+#include "BPy_Convert.h"
+#include "BPy_Interface1D.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D.h
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
similarity index 97%
rename from source/blender/freestyle/intern/python/Convert.cpp
rename to source/blender/freestyle/intern/python/BPy_Convert.cpp
index 410afe99d63..843bdc7c7d1 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,4 +1,4 @@
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,7 +82,7 @@ PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa ) {
 	return py_sa;	
 }
 
-PyObject * BPy_MediumType_from_MediumType( unsigned short n ) {
+PyObject * BPy_MediumType_from_MediumType( int n ) {
 	PyObject *py_mt =  MediumType_Type.tp_new( &MediumType_Type, 0, 0 );
 
 	PyObject *args = PyTuple_New(1);
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
similarity index 75%
rename from source/blender/freestyle/intern/python/Convert.h
rename to source/blender/freestyle/intern/python/BPy_Convert.h
index 3caf8bf67f9..8e935f6e229 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -4,15 +4,15 @@
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
-#include "Id.h"
-#include "IntegrationType.h"
-#include "Interface0D.h"
-#include "Interface0D/CurvePoint/StrokeVertex.h"
-#include "Interface0D/SVertex.h"
-#include "Interface1D/FEdge.h"
-#include "Nature.h"
-#include "MediumType.h"
-#include "StrokeAttribute.h"
+#include "BPy_Id.h"
+#include "BPy_IntegrationType.h"
+#include "BPy_Interface0D.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "Interface0D/BPy_SVertex.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "BPy_Nature.h"
+#include "BPy_MediumType.h"
+#include "BPy_StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,7 +34,7 @@ PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
-PyObject * BPy_MediumType_from_MediumType( unsigned short n );
+PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
diff --git a/source/blender/freestyle/intern/python/CurvePointIterator.cpp b/source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/CurvePointIterator.cpp
rename to source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
diff --git a/source/blender/freestyle/intern/python/EdgeModifier.cpp b/source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/EdgeModifier.cpp
rename to source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
similarity index 89%
rename from source/blender/freestyle/intern/python/Freestyle.cpp
rename to source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 2f93f1f8a74..bbb4acf4f85 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -1,19 +1,20 @@
-#include "Freestyle.h"
+#include "BPy_Freestyle.h"
 
-#include "BinaryPredicate0D.h"
-#include "BinaryPredicate1D.h"
-#include "Id.h"
-#include "IntegrationType.h"
-#include "Interface0D.h"
-#include "Interface0D/CurvePoint.h"
-#include "Interface1D.h"
-#include "Nature.h"
-#include "StrokeAttribute.h"
-#include "StrokeShader.h"
-#include "UnaryFunction0D.h"
-#include "UnaryFunction1D.h"
-#include "UnaryPredicate0D.h"
-#include "UnaryPredicate1D.h"
+#include "BPy_BinaryPredicate0D.h"
+#include "BPy_BinaryPredicate1D.h"
+#include "BPy_Id.h"
+#include "BPy_IntegrationType.h"
+#include "BPy_Interface0D.h"
+#include "Interface0D/BPy_CurvePoint.h"
+#include "BPy_Interface1D.h"
+#include "BPy_MediumType.h"
+#include "BPy_Nature.h"
+#include "BPy_StrokeAttribute.h"
+#include "BPy_StrokeShader.h"
+#include "BPy_UnaryFunction0D.h"
+#include "BPy_UnaryFunction1D.h"
+#include "BPy_UnaryPredicate0D.h"
+#include "BPy_UnaryPredicate1D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -128,14 +129,19 @@ PyObject *Freestyle_Init( void )
 	// initialize modules
 	module = Py_InitModule3( "Blender.Freestyle", M_Freestyle_methods, M_Freestyle_doc );
 	
+	
 	// attach its classes (adding the object types to the module)
+	
+	// those classes have to be initialized before the others
+	MediumType_Init( module );
+	Nature_Init( module );
+	
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
 	Interface1D_Init( module );
-	Nature_Init( module );
 	StrokeAttribute_Init( module );
 	StrokeShader_Init( module );
 	UnaryFunction0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Freestyle.h
rename to source/blender/freestyle/intern/python/BPy_Freestyle.h
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Id.cpp
rename to source/blender/freestyle/intern/python/BPy_Id.cpp
index 4f2964d8060..7d8ea07d563 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -1,6 +1,6 @@
-#include "Id.h"
+#include "BPy_Id.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Id.h
rename to source/blender/freestyle/intern/python/BPy_Id.h
diff --git a/source/blender/freestyle/intern/python/IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/IntegrationType.cpp
rename to source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
index ff6bd3d4794..9c21557da3d 100644
--- a/source/blender/freestyle/intern/python/IntegrationType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
@@ -1,6 +1,6 @@
-#include "IntegrationType.h"
+#include "BPy_IntegrationType.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
similarity index 100%
rename from source/blender/freestyle/intern/python/IntegrationType.h
rename to source/blender/freestyle/intern/python/BPy_IntegrationType.h
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
similarity index 97%
rename from source/blender/freestyle/intern/python/Interface0D.cpp
rename to source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 4c3e0af0edb..defe76464eb 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -1,12 +1,12 @@
-#include "Interface0D.h"
+#include "BPy_Interface0D.h"
 
-#include "Convert.h"
-#include "Interface0D/CurvePoint.h"
-#include "Interface0D/CurvePoint/StrokeVertex.h"
-#include "Interface0D/SVertex.h"
-#include "Interface0D/ViewVertex.h"
-#include "Interface1D/FEdge.h"
-#include "Nature.h"
+#include "BPy_Convert.h"
+#include "Interface0D/BPy_CurvePoint.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "Interface0D/BPy_SVertex.h"
+#include "Interface0D/BPy_ViewVertex.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "BPy_Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0D.h
rename to source/blender/freestyle/intern/python/BPy_Interface0D.h
diff --git a/source/blender/freestyle/intern/python/Interface0DIterator.cpp b/source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0DIterator.cpp
rename to source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/Interface1D.cpp
rename to source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index f1a14b5d62f..113fc3f1cf7 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -1,9 +1,9 @@
-#include "Interface1D.h"
+#include "BPy_Interface1D.h"
 
-#include "Convert.h"
-#include "Interface1D/FEdge.h"
-#include "Interface1D/Stroke.h"
-#include "MediumType.h"
+#include "BPy_Convert.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/BPy_Stroke.h"
+#include "BPy_MediumType.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D.h
rename to source/blender/freestyle/intern/python/BPy_Interface1D.h
diff --git a/source/blender/freestyle/intern/python/Material.cpp b/source/blender/freestyle/intern/python/BPy_Material.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Material.cpp
rename to source/blender/freestyle/intern/python/BPy_Material.cpp
diff --git a/source/blender/freestyle/intern/python/MediumType.cpp b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
similarity index 93%
rename from source/blender/freestyle/intern/python/MediumType.cpp
rename to source/blender/freestyle/intern/python/BPy_MediumType.cpp
index f0c5fcc58a4..b889d2b5c2f 100644
--- a/source/blender/freestyle/intern/python/MediumType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
@@ -1,6 +1,6 @@
-#include "MediumType.h"
+#include "BPy_MediumType.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -103,6 +103,18 @@ PyTypeObject MediumType_Type = {
 
 //-------------------MODULE INITIALIZATION--------------------------------
 
+PyMODINIT_FUNC MediumType_Init( PyObject *module )
+{	
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &MediumType_Type ) < 0 )
+		return;
+	Py_INCREF( &MediumType_Type );
+	PyModule_AddObject(module, "MediumType", (PyObject *)&MediumType_Type);
+
+}
+
 int MediumType___init__(BPy_MediumType *self, PyObject *args, PyObject *kwds)
 {
     if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0)
diff --git a/source/blender/freestyle/intern/python/MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h
similarity index 100%
rename from source/blender/freestyle/intern/python/MediumType.h
rename to source/blender/freestyle/intern/python/BPy_MediumType.h
diff --git a/source/blender/freestyle/intern/python/Nature.cpp b/source/blender/freestyle/intern/python/BPy_Nature.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Nature.cpp
rename to source/blender/freestyle/intern/python/BPy_Nature.cpp
index 14357949022..8a29bdb5bdf 100644
--- a/source/blender/freestyle/intern/python/Nature.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
@@ -1,6 +1,6 @@
-#include "Nature.h"
+#include "BPy_Nature.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Nature.h
rename to source/blender/freestyle/intern/python/BPy_Nature.h
diff --git a/source/blender/freestyle/intern/python/Noise.cpp b/source/blender/freestyle/intern/python/BPy_Noise.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Noise.cpp
rename to source/blender/freestyle/intern/python/BPy_Noise.cpp
diff --git a/source/blender/freestyle/intern/python/Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Operators.cpp
rename to source/blender/freestyle/intern/python/BPy_Operators.cpp
diff --git a/source/blender/freestyle/intern/python/SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/SShape.cpp
rename to source/blender/freestyle/intern/python/BPy_SShape.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/StrokeAttribute.cpp
rename to source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index b9f37dfa165..24c0263bc5f 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -1,6 +1,6 @@
-#include "StrokeAttribute.h"
+#include "BPy_StrokeAttribute.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeAttribute.h
rename to source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/StrokeShader.cpp
rename to source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index 029f8776c73..cdca779dafb 100644
--- a/source/blender/freestyle/intern/python/StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -1,7 +1,7 @@
-#include "StrokeShader.h"
+#include "BPy_StrokeShader.h"
 
-#include "Convert.h"
-#include "Interface1D/Stroke.h"
+#include "BPy_Convert.h"
+#include "Interface1D/BPy_Stroke.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader.h
rename to source/blender/freestyle/intern/python/BPy_StrokeShader.h
diff --git a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
rename to source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/UnaryFunction0D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index b9da3dfc20d..dda236a0989 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryFunction0D.h"
+#include "BPy_UnaryFunction0D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/UnaryFunction1D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index db026ced338..70f6feb02d3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryFunction1D.h"
+#include "BPy_UnaryFunction1D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 1d2fd6b284f..29ea68c01ca 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryPredicate0D.h"
+#include "BPy_UnaryPredicate0D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index bbbc9bfcc43..b00422a0aab 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryPredicate1D.h"
+#include "BPy_UnaryPredicate1D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
diff --git a/source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp b/source/blender/freestyle/intern/python/BPy_ViewEdgeIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp
rename to source/blender/freestyle/intern/python/BPy_ViewEdgeIterator.cpp
diff --git a/source/blender/freestyle/intern/python/ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewMap.cpp
rename to source/blender/freestyle/intern/python/BPy_ViewMap.cpp
diff --git a/source/blender/freestyle/intern/python/ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewShape.cpp
rename to source/blender/freestyle/intern/python/BPy_ViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp b/source/blender/freestyle/intern/python/BPy_orientedViewEdgeIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp
rename to source/blender/freestyle/intern/python/BPy_orientedViewEdgeIterator.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator.cpp
rename to source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
rename to source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index e1cf63727e5..6765bc84baa 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -1,6 +1,6 @@
-#include "CurvePoint.h"
+#include "BPy_CurvePoint.h"
 
-#include "../Convert.h"
+#include "../BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
rename to source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
index e40f261504f..c2a8023b745 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CURVEPOINT_H
 #define FREESTYLE_PYTHON_CURVEPOINT_H
 
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 #include "../../stroke/Curve.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index d0c622d1df2..bbfff34cb20 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -1,7 +1,7 @@
-#include "SVertex.h"
+#include "BPy_SVertex.h"
 
-#include "../Convert.h"
-#include "../Id.h"
+#include "../BPy_Convert.h"
+#include "../BPy_Id.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/SVertex.h
rename to source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
index 099417b5139..95b7d833d65 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_SVERTEX_H
 
 #include "../../view_map/Silhouette.h"
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 6168d1fb711..7e6ef8590fd 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -1,6 +1,6 @@
-#include "ViewVertex.h"
+#include "BPy_ViewVertex.h"
 
-#include "../Convert.h"
+#include "../BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
rename to source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index 98bcb9bac90..b70a69c95e7 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_VIEWVERTEX_H
 
 #include "../../view_map/ViewMap.h"
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 9d07125476e..2039b165457 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -1,7 +1,7 @@
-#include "StrokeVertex.h"
+#include "BPy_StrokeVertex.h"
 
-#include "../../Convert.h"
-#include "../../StrokeAttribute.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
rename to source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
index 4bc33ea4058..f1c54ed0041 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKEVERTEX_H
 #define FREESTYLE_PYTHON_STROKEVERTEX_H
 
-#include "../CurvePoint.h"
+#include "../BPy_CurvePoint.h"
 #include "../../../stroke/Stroke.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/Curve.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index 0cdfb9f1e0d..56dc76f0acd 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -1,7 +1,7 @@
-#include "FEdge.h"
+#include "BPy_FEdge.h"
 
-#include "../Convert.h"
-#include "../Interface0D/SVertex.h"
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge.h
rename to source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
index 230a5f36954..c54dbee98b7 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_FEDGE_H
 #define FREESTYLE_PYTHON_FEDGE_H
 
-#include "../Interface1D.h"
+#include "../BPy_Interface1D.h"
 #include "../../view_map/Silhouette.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 9951f21a0e1..8027f625cc5 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -1,7 +1,7 @@
-#include "Stroke.h"
+#include "BPy_Stroke.h"
 
-#include "../Convert.h"
-#include "../Interface0D/SVertex.h"
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
 #include "../../stroke/StrokeIterators.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface1D/Stroke.h
rename to source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
index fc4b426fd53..52c6d214b85 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKE_H
 #define FREESTYLE_PYTHON_STROKE_H
 
-#include "../Interface1D.h"
+#include "../BPy_Interface1D.h"
 #include "../../stroke/Stroke.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
diff --git a/source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp
rename to source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
rename to source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
rename to source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
rename to source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
rename to source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
rename to source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 71675ade605..9d3d89a660b 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -97,7 +97,8 @@ struct ID; /*keep me up here */
 #include "World.h"
 #include "Types.h"
 #include "Particle.h"
-#include "Freestyle.h"
+
+#include "BPy_Freestyle.h"
 
 /**********************************************************/
 /* Python API function prototypes for the Blender module.	*/