diff --git a/build/codeblocks/batch-build/build.bat b/build/codeblocks/batch-build/build.bat
index 9873e45eb..8273a8fab 100644
--- a/build/codeblocks/batch-build/build.bat
+++ b/build/codeblocks/batch-build/build.bat
@@ -45,41 +45,41 @@ codeblocks -na -nd -ns --build sfml-audio.cbp --target="Release DLL_Win32"
 REM Copy the SFML static libraries into a temporary folder
 IF NOT EXIST %TMPDIR% mkdir %TMPDIR%
 cd %SFML%\lib\mingw
-xcopy libsfml-*-s-d.a %TMPDIR%/q /y
-xcopy libsfml-*-s.a %TMPDIR%/q /y
+xcopy libsfml2-*-s-d.a %TMPDIR%/q /y
+xcopy libsfml2-*-s.a %TMPDIR%/q /y
 cd %TMPDIR%
 
 REM Add external libraries to sfml-window
-echo Adding external libraries to libsfml-window-s...
+echo Adding external libraries to libsfml2-window-s...
 ar x %SFML%\build\codeblocks\batch-build\libgdi32.a
 ar x %SFML%\build\codeblocks\batch-build\libopengl32.a
 ar x %SFML%\build\codeblocks\batch-build\libwinmm.a
-ar rs libsfml-window-s.a *.o
-ar rs libsfml-window-s-d.a *.o
+ar rs libsfml2-window-s.a *.o
+ar rs libsfml2-window-s-d.a *.o
 del *.o /f /q
 
 REM Add external libraries to sfml-graphics
-echo Adding external libraries to libsfml-graphics-s...
+echo Adding external libraries to libsfml2-graphics-s...
 ar x %SFML%\extlibs\libs-mingw\libfreetype.a
 ar x %SFML%\extlibs\libs-mingw\libglew.a
 ar x %SFML%\extlibs\libs-mingw\libjpeg.a
-ar rs libsfml-graphics-s.a *.o
-ar rs libsfml-graphics-s-d.a *.o
+ar rs libsfml2-graphics-s.a *.o
+ar rs libsfml2-graphics-s-d.a *.o
 del *.o /f /q
 
 REM Add external libraries to sfml-audio
-echo Adding external libraries to libsfml-audio-s...
+echo Adding external libraries to libsfml2-audio-s...
 ar x %SFML%\extlibs\libs-mingw\libopenal32.a
 ar x %SFML%\extlibs\libs-mingw\libsndfile.a
-ar rs libsfml-audio-s.a *.o
-ar rs libsfml-audio-s-d.a *.o
+ar rs libsfml2-audio-s.a *.o
+ar rs libsfml2-audio-s-d.a *.o
 del *.o /f /q
 
 REM Add external libraries to sfml-network
-echo Adding external libraries to libsfml-network-s...
+echo Adding external libraries to libsfml2-network-s...
 ar x %SFML%\build\codeblocks\batch-build\libws2_32.a
-ar rs libsfml-network-s.a *.o
-ar rs libsfml-network-s-d.a *.o
+ar rs libsfml2-network-s.a *.o
+ar rs libsfml2-network-s-d.a *.o
 del *.o /f /q
 
 REM Copy the SFML libraries to their final location
diff --git a/build/codeblocks/sfml-audio.cbp b/build/codeblocks/sfml-audio.cbp
index 208dc8dde..943fa959b 100644
--- a/build/codeblocks/sfml-audio.cbp
+++ b/build/codeblocks/sfml-audio.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-audio-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-audio-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-audio\Debug DLL_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system-d.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system-d.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
@@ -28,16 +28,16 @@
 					<Add directory="..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add library="..\..\extlibs\libs-mingw\libopenal32.a" />
 					<Add library="..\..\extlibs\libs-mingw\libsndfile.a" />
 					<Add directory="..\..\extlibs" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-audio" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-audio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-audio\Release DLL_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
@@ -55,17 +55,17 @@
 					<Add directory="..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system.a" />
 					<Add library="..\..\extlibs\libs-mingw\libopenal32.a" />
 					<Add library="..\..\extlibs\libs-mingw\libsndfile.a" />
 					<Add directory="..\..\extlibs" />
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-audio-s-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-audio-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-audio\Debug static_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system-s-d.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system-s-d.a;" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -84,10 +84,10 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-audio-s" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-audio-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-audio\Release static_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system-s.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system-s.a;" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/build/codeblocks/sfml-graphics.cbp b/build/codeblocks/sfml-graphics.cbp
index 91899112e..f18039ddd 100644
--- a/build/codeblocks/sfml-graphics.cbp
+++ b/build/codeblocks/sfml-graphics.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-graphics-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-graphics-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Debug DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -28,8 +28,8 @@
 					<Add directory="..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\lib\mingw\libsfml-window-d.a" />
-					<Add library="..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\lib\mingw\libsfml2-window-d.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add library="..\..\extlibs\libs-mingw\libfreetype.a" />
 					<Add library="..\..\extlibs\libs-mingw\libglew.a" />
 					<Add library="..\..\extlibs\libs-mingw\libjpeg.a" />
@@ -38,9 +38,9 @@
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-graphics" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-graphics" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Release DLL_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-window.a;..\lib\mingw\libsfml-system.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-window.a;..\lib\mingw\libsfml2-system.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
@@ -60,8 +60,8 @@
 					<Add directory="..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\lib\mingw\libsfml-window.a" />
-					<Add library="..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\lib\mingw\libsfml2-window.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system.a" />
 					<Add library="..\..\extlibs\libs-mingw\libfreetype.a" />
 					<Add library="..\..\extlibs\libs-mingw\libglew.a" />
 					<Add library="..\..\extlibs\libs-mingw\libjpeg.a" />
@@ -70,10 +70,10 @@
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-graphics-s-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-graphics-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Debug static_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-window-s-d.a;..\lib\mingw\libsfml-system-s-d.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-window-s-d.a;..\lib\mingw\libsfml2-system-s-d.a;" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -93,10 +93,10 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-graphics-s" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-graphics-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Release static_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-window-s.a;..\lib\mingw\libsfml-system-s.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-window-s.a;..\lib\mingw\libsfml2-system-s.a;" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/build/codeblocks/sfml-main.cbp b/build/codeblocks/sfml-main.cbp
index 68d881d01..6dc670f45 100644
--- a/build/codeblocks/sfml-main.cbp
+++ b/build/codeblocks/sfml-main.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-main-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-main-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-main\Debug static_Win32" />
 				<Option type="2" />
@@ -23,7 +23,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-main" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-main" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-main\Release static_Win32" />
 				<Option type="2" />
@@ -38,7 +38,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\libsfml-main-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-main-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-main\Debug DLL_Win32" />
 				<Option type="2" />
@@ -54,7 +54,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\libsfml-main" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-main" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-main\Release DLL_Win32" />
 				<Option type="2" />
diff --git a/build/codeblocks/sfml-network.cbp b/build/codeblocks/sfml-network.cbp
index d33bbf729..6b263ad49 100644
--- a/build/codeblocks/sfml-network.cbp
+++ b/build/codeblocks/sfml-network.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-network-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-network-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-network\Debug DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -28,12 +28,12 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add library="ws2_32" />
-					<Add library="..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add directory="..\..\bin\static" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-network" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-network" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-network\Release DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -53,12 +53,12 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add library="ws2_32" />
-					<Add library="..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system.a" />
 					<Add directory="..\..\bin\static" />
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-network-s-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-network-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-network\Debug static_Win32" />
 				<Option type="2" />
@@ -82,7 +82,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-network-s" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-network-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-network\Release static_Win32" />
 				<Option type="2" />
diff --git a/build/codeblocks/sfml-system.cbp b/build/codeblocks/sfml-system.cbp
index 117b92e1a..96137a415 100644
--- a/build/codeblocks/sfml-system.cbp
+++ b/build/codeblocks/sfml-system.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-system-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-system-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-system\Debug DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -27,7 +27,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-system" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-system" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-system\Release DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -46,7 +46,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-system-s-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-system-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-system\Debug static_Win32" />
 				<Option type="2" />
@@ -66,7 +66,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-system-s" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-system-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-system\Release static_Win32" />
 				<Option type="2" />
diff --git a/build/codeblocks/sfml-window.cbp b/build/codeblocks/sfml-window.cbp
index 636547d74..c8d762223 100644
--- a/build/codeblocks/sfml-window.cbp
+++ b/build/codeblocks/sfml-window.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-window-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-window-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-window\Debug DLL_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system-d.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system-d.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
@@ -28,15 +28,15 @@
 					<Add directory="..\..\src" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add library="libopengl32.a" />
 					<Add library="libwinmm.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-window" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml2-window" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-window\Release DLL_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createStaticLib="1" />
@@ -54,16 +54,16 @@
 					<Add directory="..\..\src" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\lib\mingw\libsfml2-system.a" />
 					<Add library="libopengl32.a" />
 					<Add library="libwinmm.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-window-s-d" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-window-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-window\Debug static_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system-s-d.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system-s-d.a;" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -81,10 +81,10 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-window-s" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml2-window-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\codeblocks\sfml-window\Release static_Win32" />
-				<Option external_deps="..\..\lib\mingw\libsfml-system-s.a;" />
+				<Option external_deps="..\..\lib\mingw\libsfml2-system-s.a;" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/build/make/Makefile.audio b/build/make/Makefile.audio
index 95facde2a..bfde9091c 100644
--- a/build/make/Makefile.audio
+++ b/build/make/Makefile.audio
@@ -1,17 +1,17 @@
 SRC         = $(wildcard $(SRCROOT)/Audio/*.cpp)
 OBJ         = $(SRC:.cpp=.o)
-LIB         = libsfml-audio.so
+LIB         = libsfml2-audio.so
 LIBNAME     = $(LIB).$(VERSION)
 FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
+LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
 
 all: $(LIB)
 
-libsfml-audio.so: $(OBJ)
+libsfml2-audio.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lsndfile -lopenal
 
 $(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
+	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/AL
 
 .PHONY: clean mrproper
 
@@ -22,6 +22,6 @@ mrproper: clean
 	rm -rf $(FULLLIBNAME)
 
 install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
+	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
 	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
 	$(LINK)
diff --git a/build/make/Makefile.graphics b/build/make/Makefile.graphics
index dc5af67e1..5858ef3c3 100644
--- a/build/make/Makefile.graphics
+++ b/build/make/Makefile.graphics
@@ -1,13 +1,13 @@
 SRC         = $(wildcard $(SRCROOT)/Graphics/*.cpp $(SRCROOT)/Graphics/Linux/*.cpp)
 OBJ         = $(SRC:.cpp=.o)
-LIB         = libsfml-graphics.so
+LIB         = libsfml2-graphics.so
 LIBNAME     = $(LIB).$(VERSION)
 FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
 LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
 
 all: $(LIB)
 
-libsfml-graphics.so: $(OBJ)
+libsfml2-graphics.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lGLEW -ljpeg -lfreetype -lX11 -lGL
 
 $(OBJ): %.o: %.cpp
diff --git a/build/make/Makefile.network b/build/make/Makefile.network
index c07d9cf58..414d9bffa 100644
--- a/build/make/Makefile.network
+++ b/build/make/Makefile.network
@@ -1,13 +1,13 @@
 SRC         = $(wildcard $(SRCROOT)/Network/*.cpp $(SRCROOT)/Network/Unix/*.cpp)
 OBJ         = $(SRC:.cpp=.o)
-LIB         = libsfml-network.so
+LIB         = libsfml2-network.so
 LIBNAME     = $(LIB).$(VERSION)
 FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
+LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
 
 all: $(LIB)
 
-libsfml-network.so: $(OBJ)
+libsfml2-network.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ)
 
 $(OBJ): %.o: %.cpp
@@ -22,6 +22,6 @@ mrproper: clean
 	rm -rf $(FULLLIBNAME)
 
 install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
+	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
 	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
 	$(LINK)
diff --git a/build/make/Makefile.system b/build/make/Makefile.system
index fd3e55914..107867f64 100644
--- a/build/make/Makefile.system
+++ b/build/make/Makefile.system
@@ -1,13 +1,13 @@
 SRC         = $(wildcard $(SRCROOT)/System/*.cpp $(SRCROOT)/System/Unix/*.cpp)
 OBJ         = $(SRC:.cpp=.o)
-LIB         = libsfml-system.so
+LIB         = libsfml2-system.so
 LIBNAME     = $(LIB).$(VERSION)
 FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
+LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
 
 all: $(LIB)
 
-libsfml-system.so: $(OBJ)
+libsfml2-system.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lpthread
 
 $(OBJ): %.o: %.cpp
@@ -22,6 +22,6 @@ mrproper: clean
 	rm -rf $(FULLLIBNAME)
 
 install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
+	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
 	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
 	$(LINK)
diff --git a/build/make/Makefile.window b/build/make/Makefile.window
index c86bb5433..70e564915 100644
--- a/build/make/Makefile.window
+++ b/build/make/Makefile.window
@@ -1,13 +1,13 @@
 SRC         = $(wildcard $(SRCROOT)/Window/*.cpp $(SRCROOT)/Window/Linux/*.cpp)
 OBJ         = $(SRC:.cpp=.o)
-LIB         = libsfml-window.so
+LIB         = libsfml2-window.so
 LIBNAME     = $(LIB).$(VERSION)
 FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
+LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
 
 all: $(LIB)
 
-libsfml-window.so: $(OBJ)
+libsfml2-window.so: $(OBJ)
 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lX11 -lXrandr -lGL
 
 $(OBJ): %.o: %.cpp
@@ -22,6 +22,6 @@ mrproper: clean
 	rm -rf $(FULLLIBNAME)
 
 install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
+	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
 	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
 	$(LINK)
diff --git a/build/vc2005/sfml-audio.vcproj b/build/vc2005/sfml-audio.vcproj
index 732d0863c..24b53f408 100644
--- a/build/vc2005/sfml-audio.vcproj
+++ b/build/vc2005/sfml-audio.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -245,7 +245,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -321,7 +321,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2005/sfml-graphics.vcproj b/build/vc2005/sfml-graphics.vcproj
index eaa17673e..974fabddd 100644
--- a/build/vc2005/sfml-graphics.vcproj
+++ b/build/vc2005/sfml-graphics.vcproj
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
@@ -168,7 +168,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
@@ -259,7 +259,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-s-d.lib"
 				AdditionalLibraryDirectories=""
 			/>
 			<Tool
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-s.lib"
 				AdditionalLibraryDirectories=""
 			/>
 			<Tool
diff --git a/build/vc2005/sfml-main.vcproj b/build/vc2005/sfml-main.vcproj
index 275deb11d..a4822f848 100644
--- a/build/vc2005/sfml-main.vcproj
+++ b/build/vc2005/sfml-main.vcproj
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-main-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -126,7 +126,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-main.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2005/sfml-network.vcproj b/build/vc2005/sfml-network.vcproj
index 5fbe43135..c65165119 100644
--- a/build/vc2005/sfml-network.vcproj
+++ b/build/vc2005/sfml-network.vcproj
@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
 				GenerateDebugInformation="true"
@@ -157,7 +157,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
 				GenerateDebugInformation="true"
@@ -243,7 +243,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -318,7 +318,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2005/sfml-system.vcproj b/build/vc2005/sfml-system.vcproj
index 21e93979f..48af1eb3f 100644
--- a/build/vc2005/sfml-system.vcproj
+++ b/build/vc2005/sfml-system.vcproj
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -239,7 +239,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -316,7 +316,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2005/sfml-window.vcproj b/build/vc2005/sfml-window.vcproj
index d3c9d5556..374283cbf 100644
--- a/build/vc2005/sfml-window.vcproj
+++ b/build/vc2005/sfml-window.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -245,7 +245,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -326,7 +326,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2008/sfml-audio.vcproj b/build/vc2008/sfml-audio.vcproj
index d60b3e788..bd5e11f27 100644
--- a/build/vc2008/sfml-audio.vcproj
+++ b/build/vc2008/sfml-audio.vcproj
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -244,7 +244,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -321,7 +321,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2008/sfml-graphics.vcproj b/build/vc2008/sfml-graphics.vcproj
index 598e21aaf..94a83087a 100644
--- a/build/vc2008/sfml-graphics.vcproj
+++ b/build/vc2008/sfml-graphics.vcproj
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
@@ -168,7 +168,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
@@ -259,7 +259,7 @@
 				Name="VCLibrarianTool"
 				AdditionalOptions="/VERBOSE:LIB"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics-s-d.lib"
 				AdditionalLibraryDirectories=""
 			/>
 			<Tool
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics-s.lib"
 				AdditionalLibraryDirectories=""
 			/>
 			<Tool
diff --git a/build/vc2008/sfml-main.vcproj b/build/vc2008/sfml-main.vcproj
index 4480a8e9f..51ac74c76 100644
--- a/build/vc2008/sfml-main.vcproj
+++ b/build/vc2008/sfml-main.vcproj
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-main-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -125,7 +125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-main.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2008/sfml-network.vcproj b/build/vc2008/sfml-network.vcproj
index 2aaa323b7..47790a711 100644
--- a/build/vc2008/sfml-network.vcproj
+++ b/build/vc2008/sfml-network.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
 				GenerateDebugInformation="true"
@@ -156,7 +156,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
 				GenerateDebugInformation="true"
@@ -241,7 +241,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -317,7 +317,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2008/sfml-system.vcproj b/build/vc2008/sfml-system.vcproj
index 6f5008714..b381f5ebd 100644
--- a/build/vc2008/sfml-system.vcproj
+++ b/build/vc2008/sfml-system.vcproj
@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -238,7 +238,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -313,7 +313,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/build/vc2008/sfml-window.vcproj b/build/vc2008/sfml-window.vcproj
index 84ea34c9c..2fe5acd65 100644
--- a/build/vc2008/sfml-window.vcproj
+++ b/build/vc2008/sfml-window.vcproj
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window-d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -244,7 +244,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window-s-d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -321,7 +321,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="opengl32.lib winmm.lib"
-				OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib"
+				OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window-s.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/examples/build/codeblocks/ftp.cbp b/examples/build/codeblocks/ftp.cbp
index 71e1440c3..0c6d96cc5 100644
--- a/examples/build/codeblocks/ftp.cbp
+++ b/examples/build/codeblocks/ftp.cbp
@@ -23,8 +23,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -43,8 +43,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -65,8 +65,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -86,8 +86,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/opengl.cbp b/examples/build/codeblocks/opengl.cbp
index 816e0c713..bc4e95d70 100644
--- a/examples/build/codeblocks/opengl.cbp
+++ b/examples/build/codeblocks/opengl.cbp
@@ -24,10 +24,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -49,10 +49,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -75,10 +75,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -102,10 +102,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
diff --git a/examples/build/codeblocks/pong.cbp b/examples/build/codeblocks/pong.cbp
index 07cb9c822..990fa2e55 100644
--- a/examples/build/codeblocks/pong.cbp
+++ b/examples/build/codeblocks/pong.cbp
@@ -24,11 +24,11 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -50,11 +50,11 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -78,11 +78,11 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -105,11 +105,11 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-audio.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
diff --git a/examples/build/codeblocks/shader.cbp b/examples/build/codeblocks/shader.cbp
index 28029c2d7..e50077eeb 100644
--- a/examples/build/codeblocks/shader.cbp
+++ b/examples/build/codeblocks/shader.cbp
@@ -24,10 +24,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -47,10 +47,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -72,10 +72,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -96,10 +96,10 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-graphics.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/sockets.cbp b/examples/build/codeblocks/sockets.cbp
index 21923226f..0604db413 100644
--- a/examples/build/codeblocks/sockets.cbp
+++ b/examples/build/codeblocks/sockets.cbp
@@ -23,8 +23,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -43,8 +43,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -65,8 +65,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -86,8 +86,8 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-network.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/sound-capture.cbp b/examples/build/codeblocks/sound-capture.cbp
index f7e87a653..de054106d 100644
--- a/examples/build/codeblocks/sound-capture.cbp
+++ b/examples/build/codeblocks/sound-capture.cbp
@@ -24,8 +24,8 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -45,8 +45,8 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -68,8 +68,8 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -90,8 +90,8 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/sound.cbp b/examples/build/codeblocks/sound.cbp
index 95822b1d5..12b9f140b 100644
--- a/examples/build/codeblocks/sound.cbp
+++ b/examples/build/codeblocks/sound.cbp
@@ -25,8 +25,8 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add option="-static-libgcc" />
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -46,8 +46,8 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -70,8 +70,8 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add option="-static-libgcc" />
-					<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -92,8 +92,8 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/voip.cbp b/examples/build/codeblocks/voip.cbp
index 753482d06..826fa3b8d 100644
--- a/examples/build/codeblocks/voip.cbp
+++ b/examples/build/codeblocks/voip.cbp
@@ -24,9 +24,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-network-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -46,9 +46,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-network-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -70,9 +70,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-network-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -93,9 +93,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-network.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-network.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/win32.cbp b/examples/build/codeblocks/win32.cbp
index b056e84e4..a9e792e26 100644
--- a/examples/build/codeblocks/win32.cbp
+++ b/examples/build/codeblocks/win32.cbp
@@ -24,9 +24,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
@@ -46,9 +46,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 				</Linker>
 			</Target>
 			<Target title="Debug DLL_Win32">
@@ -70,9 +70,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
@@ -93,9 +93,9 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-graphics.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/examples/build/codeblocks/window.cbp b/examples/build/codeblocks/window.cbp
index 6ac47c636..c67e0770f 100644
--- a/examples/build/codeblocks/window.cbp
+++ b/examples/build/codeblocks/window.cbp
@@ -23,9 +23,9 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -46,9 +46,9 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -71,9 +71,9 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
@@ -95,9 +95,9 @@
 					<Add directory="..\..\..\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-main.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-window.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-main.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-window.a" />
+					<Add library="..\..\..\lib\mingw\libsfml2-system.a" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
 				</Linker>
diff --git a/examples/build/make/Makefile.X11 b/examples/build/make/Makefile.X11
index fbc0de83c..160232af9 100644
--- a/examples/build/make/Makefile.X11
+++ b/examples/build/make/Makefile.X11
@@ -1,7 +1,7 @@
 EXE     = X11
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-window -lsfml-system -lGLU -lGL -lX11
+LDFLAGS = -lsfml2-window -lsfml2-system -lGLU -lGL -lX11
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.ftp b/examples/build/make/Makefile.ftp
index 8361cc28f..23123e439 100644
--- a/examples/build/make/Makefile.ftp
+++ b/examples/build/make/Makefile.ftp
@@ -1,7 +1,7 @@
 EXE     = ftp
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-network -lsfml-system
+LDFLAGS = -lsfml2-network -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.opengl b/examples/build/make/Makefile.opengl
index e346fc37c..cf99bcdb9 100644
--- a/examples/build/make/Makefile.opengl
+++ b/examples/build/make/Makefile.opengl
@@ -1,7 +1,7 @@
 EXE     = opengl
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system -lGLU -lGL
+LDFLAGS = -lsfml2-graphics -lsfml2-window -lsfml2-system -lGLU -lGL
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.pong b/examples/build/make/Makefile.pong
index 9ef9324b8..693072db4 100644
--- a/examples/build/make/Makefile.pong
+++ b/examples/build/make/Makefile.pong
@@ -1,7 +1,7 @@
 EXE     = pong
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-audio -lsfml-graphics -lsfml-window -lsfml-system
+LDFLAGS = -lsfml2-audio -lsfml2-graphics -lsfml2-window -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.shader b/examples/build/make/Makefile.shader
index 61321e605..2b9eeba55 100644
--- a/examples/build/make/Makefile.shader
+++ b/examples/build/make/Makefile.shader
@@ -1,7 +1,7 @@
 EXE     = shader
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system
+LDFLAGS = -lsfml2-graphics -lsfml2-window -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.sockets b/examples/build/make/Makefile.sockets
index a14fdce95..5131baf12 100644
--- a/examples/build/make/Makefile.sockets
+++ b/examples/build/make/Makefile.sockets
@@ -1,7 +1,7 @@
 EXE     = sockets
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-network -lsfml-system
+LDFLAGS = -lsfml2-network -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.sound b/examples/build/make/Makefile.sound
index 6de690002..8ad0faa42 100644
--- a/examples/build/make/Makefile.sound
+++ b/examples/build/make/Makefile.sound
@@ -1,7 +1,7 @@
 EXE     = sound
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-audio -lsfml-system
+LDFLAGS = -lsfml2-audio -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.sound_capture b/examples/build/make/Makefile.sound_capture
index d6cfe2d88..98ce1c8cd 100644
--- a/examples/build/make/Makefile.sound_capture
+++ b/examples/build/make/Makefile.sound_capture
@@ -1,7 +1,7 @@
 EXE     = sound_capture
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-audio -lsfml-system
+LDFLAGS = -lsfml2-audio -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.voip b/examples/build/make/Makefile.voip
index 82d29e174..57838d101 100644
--- a/examples/build/make/Makefile.voip
+++ b/examples/build/make/Makefile.voip
@@ -1,7 +1,7 @@
 EXE     = voip
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-audio -lsfml-network -lsfml-system
+LDFLAGS = -lsfml2-audio -lsfml2-network -lsfml2-system
 
 all: $(EXE)
 
diff --git a/examples/build/make/Makefile.window b/examples/build/make/Makefile.window
index a4225269f..ccccc4683 100644
--- a/examples/build/make/Makefile.window
+++ b/examples/build/make/Makefile.window
@@ -1,7 +1,7 @@
 EXE     = window
 SRC     = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
 OBJ     = $(SRC:.cpp=.o)
-LDFLAGS = -lsfml-window -lsfml-system -lGLU -lGL
+LDFLAGS = -lsfml2-window -lsfml2-system -lGLU -lGL
 
 all: $(EXE)