rename libs internal libs for CMake + SCons (used in MSVC project files)

for game engine use "ge_" prefix & make names generally more descriptive.

43 files changed, 83 insertions, 83 deletions

diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index a39235b20ec..0a1d2d3fd74 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -44,4 +44,4 @@ SET(SRC
 	logmemfile.c
 )
 
-BLENDERLIB(bf_cineon "${SRC}" "${INC}")
+BLENDERLIB(bf_imbuf_cineon "${SRC}" "${INC}")
diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
index d9c8ab14d35..25088c6e34a 100644
--- a/source/blender/imbuf/intern/cineon/SConscript
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -14,4 +14,4 @@ incs = ['.',
 
 defs = []
 
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175])
+env.BlenderLib ('bf_imbuf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175])
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index 78513b35b87..5634368383d 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -48,4 +48,4 @@ if(WITH_IMAGE_DDS)
 	ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_IMAGE_DDS)
 
-BLENDERLIB(bf_dds "${SRC}" "${INC}")                 
+BLENDERLIB(bf_imbuf_dds "${SRC}" "${INC}")                 
diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index 59509c88f03..918ae7b530b 100644
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/source/blender/imbuf/intern/dds/SConscript
@@ -16,4 +16,4 @@ incs = ['.',
 
 defs = ['WITH_DDS']
 
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190])
+env.BlenderLib ('bf_imbuf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190])
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 836958f4b09..edea033bb3a 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -44,4 +44,4 @@ IF(WITH_IMAGE_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)
 
-BLENDERLIB(bf_openexr "${SRC}" "${INC}")                 
+BLENDERLIB(bf_imbuf_openexr "${SRC}" "${INC}")                 
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index 47f83868baa..082bb82c322 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -15,4 +15,4 @@ incs += Split(env['BF_OPENEXR_INC'])
 
 defs = ['WITH_OPENEXR']
 
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180])
+env.BlenderLib ('bf_imbuf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180])
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index b3c9aede6b5..ada62851bc5 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -53,7 +53,7 @@ ADD_DEPENDENCIES(blenderplayer makesdna)
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
+SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} ge_player_common ge_player_ghost blenkernel_blc)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
@@ -62,53 +62,53 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 IF(UNIX)
 	# Sort libraries
 	SET(BLENDER_SORTED_LIBS
-		gp_ghost 
-		gp_common 
+		ge_player_ghost 
+		ge_player_common 
 		bf_intern_string 
 		bf_intern_ghost
 		bf_rna
 		bf_blenkernel
 		bf_blenloader 
 		bf_blenpluginapi 
-		bf_blroutines
+		ge_blen_routines
 		bf_editor_datafiles
-		bf_converter 
-		bf_ketsji 
-		bf_bullet 
-		bf_dummy
-		bf_common 
-		bf_logic 
-		bf_rasterizer 
-		bf_oglrasterizer 
-		bf_expressions 
-		bf_scenegraph
+		ge_converter 
+		ge_logic_ketsji 
+		ge_phys_bullet 
+		ge_phys_dummy
+		ge_phys_common 
+		ge_logic 
+		ge_rasterizer 
+		ge_oglrasterizer 
+		ge_logic_expressions 
+		ge_scenegraph
 		bf_ikplugin
 		bf_intern_itasc
 		bf_intern_ik
 		bf_intern_smoke
 		bf_modifiers
 		bf_intern_moto 
-		bf_kernel 
+		bf_gen_system 
 		bf_nodes
 		bf_gpu
 		bf_imbuf
 		bf_avi 
-		kx_network 
-		bf_ngnetwork 
-		bf_loopbacknetwork 
+		ge_logic_network 
+		ge_logic_ngnetwork 
+		ge_logic_loopbacknetwork 
 		extern_bullet 
 		bf_intern_guardedalloc 
 		bf_intern_memutil 
 		bf_python
 		bf_python_ext
 		bf_blenlib 
-		bf_cineon
-		bf_openexr 
+		bf_imbuf_cineon
+		bf_imbuf_openexr 
 		extern_openjpeg 
-		bf_dds
+		bf_imbuf_dds
 		bf_readblenfile 
 		bf_dna
-		bf_videotex
+		ge_videotex
 		bf_blenfont
 		bf_intern_audaspace
 		blenkernel_blc
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e093eb8cb65..5e33976cb94 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -524,44 +524,44 @@ ENDIF(WITH_MOD_FLUID)
 		bf_blenpluginapi 
 		bf_imbuf 
 		bf_avi 
-		bf_cineon 
-		bf_openexr 
-		bf_dds
+		bf_imbuf_cineon 
+		bf_imbuf_openexr 
+		bf_imbuf_dds
 		bf_readblenfile
 		bf_collada
 		bf_intern_bsp 
 		bf_intern_bop 
-		bf_kernel 
+		bf_gen_system 
 		bf_intern_decimate 
 		bf_intern_elbeem 
 		bf_intern_ik 
 		bf_intern_memutil 
 		bf_intern_guardedalloc 
 		bf_intern_ctr 
-		bf_blroutines 
-		bf_converter 
-		bf_dummy
-		bf_bullet 
+		ge_blen_routines 
+		ge_converter 
+		ge_phys_dummy
+		ge_phys_bullet 
 		bf_intern_smoke
 		extern_minilzo
 		extern_lzma
-		bf_ketsji 
-		bf_common
-		bf_logic 
-		bf_rasterizer 
-		bf_oglrasterizer 
-		bf_expressions 
-		bf_scenegraph 
-		kx_network 
-		bf_kernel
+		ge_logic_ketsji 
+		ge_phys_common
+		ge_logic 
+		ge_rasterizer 
+		ge_oglrasterizer 
+		ge_logic_expressions 
+		ge_scenegraph 
+		ge_logic_network 
+		bf_gen_system
 		bf_python # duplicate for BPY_eval_driver
-		bf_ngnetwork 
+		ge_logic_ngnetwork 
 		extern_bullet 
-		bf_loopbacknetwork 
+		ge_logic_loopbacknetwork 
 		bf_intern_moto 
 		extern_glew
 		extern_openjpeg
-		bf_videotex
+		ge_videotex
 		bf_rna
 		bf_dna
 		bf_blenfont
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 1f895ad0abc..63382e1f325 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -54,4 +54,4 @@ IF(WITH_PYTHON)
 	ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
+BLENDERLIB(ge_blen_routines "${SRC}" "${INC}")
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 91dc2692384..ff70ad3bf7b 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -35,4 +35,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 9e0b4242f28..4e64bcf8b11 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -92,4 +92,4 @@ IF(WITH_BULLET)
 	ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
-BLENDERLIB(bf_converter "${SRC}" "${INC}")
+BLENDERLIB(ge_converter "${SRC}" "${INC}")
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index f6cf2331a43..9d88018d805 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -37,4 +37,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index ad446d1085e..5ab7c6eeae2 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -61,4 +61,4 @@ IF(WITH_PYTHON)
 	ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_expressions "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_expressions "${SRC}" "${INC}")
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index dea652dabb4..b1e34aa358b 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -14,4 +14,4 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_logic_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index b346df2b340..1f0850d6970 100644
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -90,4 +90,4 @@ IF(WITH_PYTHON)
 	ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_logic "${SRC}" "${INC}")
+BLENDERLIB(ge_logic "${SRC}" "${INC}")
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 04990e10d06..a8d3ee65f4c 100644
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -26,4 +26,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 39667a27c7d..3ed2490aadd 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -76,4 +76,4 @@ ENDIF(WITH_PYTHON)
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
-BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(ge_player_common "${SRC}" "${INC}")
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 60cb437b10f..86fb66974db 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -67,4 +67,4 @@ if env['WITH_BF_PYTHON']:
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
 
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='ge_player_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 824b11d77f8..8810e875810 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -76,4 +76,4 @@ IF(WITH_PYTHON)
 	ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(ge_player_ghost "${SRC}" "${INC}")
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index eb3d50a49bd..7c8f1c6f4f0 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -50,4 +50,4 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='ge_player_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 1ca71e678e8..7b5a70f0676 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -147,4 +147,4 @@ IF(WITH_BULLET)
 	LIST(APPEND INC ../../../source/gameengine/Physics/Bullet )
 ENDIF(WITH_BULLET)
 
-BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_ketsji "${SRC}" "${INC}")
diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index 5099534c0ad..ce9a7492ba1 100644
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -49,4 +49,4 @@ IF(WITH_PYTHON)
 	ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(kx_network "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_network "${SRC}" "${INC}")
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 5f7cf9edcd8..3e86080a2f8 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -46,4 +46,4 @@ if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
     incs += ' #source/gameengine/Physics/Bullet'
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_logic_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index 3dde84d29c1..b46f6696efd 100644
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -37,4 +37,4 @@ SET(SRC
 	NG_NetworkScene.cpp
 )
 
-BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_ngnetwork "${SRC}" "${INC}")
diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index eae2971ce6a..9467b59310f 100644
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -35,4 +35,4 @@ SET(SRC
 	NG_LoopBackNetworkDeviceInterface.cpp
 )
 
-BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_loopbacknetwork "${SRC}" "${INC}")
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index dd23e1327eb..af76065cc94 100644
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
+env.BlenderLib ( 'ge_logic_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 3cf1747d013..1b63592d0a4 100644
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] )
+env.BlenderLib ( 'ge_logic_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] )
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 1954d58df3e..89f2649cfc1 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -57,4 +57,4 @@ IF(WITH_BULLET)
 	ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
-BLENDERLIB(bf_bullet "${SRC}" "${INC}")
+BLENDERLIB(ge_phys_bullet "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 272d0003c1a..f8f0f8afaea 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -32,4 +32,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_phys_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt
index 501fbcd94de..387fa9e7f8d 100644
--- a/source/gameengine/Physics/Dummy/CMakeLists.txt
+++ b/source/gameengine/Physics/Dummy/CMakeLists.txt
@@ -33,4 +33,4 @@ SET(SRC
 	DummyPhysicsEnvironment.cpp
 )
 
-BLENDERLIB(bf_dummy "${SRC}" "${INC}")
+BLENDERLIB(ge_phys_dummy "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index 496092133c3..13d1a893823 100644
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,60] )
+env.BlenderLib ( 'ge_phys_dummy', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,60] )
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt
index f67de0f77d0..0710ba3e2c6 100644
--- a/source/gameengine/Physics/common/CMakeLists.txt
+++ b/source/gameengine/Physics/common/CMakeLists.txt
@@ -38,4 +38,4 @@ SET(SRC
 	PHY_IVehicle.cpp
 )
 
-BLENDERLIB(bf_common "${SRC}" "${INC}")
+BLENDERLIB(ge_phys_common "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index 38bb7a11309..abff3e33121 100644
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_phys_common', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index 9bbf7e144d5..88399f9ca9d 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -53,4 +53,4 @@ SET(SRC
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
-BLENDERLIB(bf_rasterizer "${SRC}" "${INC}")
+BLENDERLIB(ge_rasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index a89faae3c73..36ccd79527b 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -48,4 +48,4 @@ SET(SRC
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
-BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
+BLENDERLIB(ge_oglrasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 8ad6a8b28a2..791478cae38 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -13,4 +13,4 @@ incs += ' #intern/guardedalloc #source/blender/blenlib'
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 045714e80ac..bff2a7e2084 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -15,4 +15,4 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), defs, libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_rasterizer', sources, Split(incs), defs, libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt
index d1b207b6efa..1ba1f8175cd 100644
--- a/source/gameengine/SceneGraph/CMakeLists.txt
+++ b/source/gameengine/SceneGraph/CMakeLists.txt
@@ -38,4 +38,4 @@ SET(SRC
 	SG_Tree.cpp
 )
 
-BLENDERLIB(bf_scenegraph "${SRC}" "${INC}")
+BLENDERLIB(ge_scenegraph "${SRC}" "${INC}")
diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index 992a10befa2..b4738bd20b4 100644
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -12,4 +12,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), defs, libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_scenegraph', sources, Split(incs), defs, libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 1bde0bc8a40..3ad74ef7860 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -78,4 +78,4 @@ IF(WITH_PYTHON)
 	ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_videotex "${SRC}" "${INC}")
+BLENDERLIB(ge_videotex "${SRC}" "${INC}")
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 8a5e3726aa7..2cd143d2deb 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -27,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[340,205], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[340,205], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt
index 1665a3c1525..41e725906c8 100644
--- a/source/kernel/CMakeLists.txt
+++ b/source/kernel/CMakeLists.txt
@@ -40,4 +40,4 @@ SET(SRC
 	gen_system/SYS_System.cpp
 )
 
-BLENDERLIB(bf_kernel "${SRC}" "${INC}")
+BLENDERLIB(bf_gen_system "${SRC}" "${INC}")
diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 3110f46cfad..385a3064c76 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core','player'], priority = [400,100] )
+env.BlenderLib ( 'bf_gen_system', Split(sources), Split(incs), [], libtype = ['core','player'], priority = [400,100] )