diff --git a/Adapt/Makefile b/Adapt/Makefile
index 75062c45c109d3f983de20a29b66f31edea0b683..798e5fd0b1932fe3bff62efad32c3b79e5be0535 100644
--- a/Adapt/Makefile
+++ b/Adapt/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.24 2001-12-04 10:47:39 geuzaine Exp $
+# $Id: Makefile,v 1.25 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libAdapt.a"
+# Makefile for "libGmshAdapt.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR        = ar ruvs
 RM        = rm
 RANLIB    = ranlib
 
-LIB       = ../lib/libAdapt.a
+LIB       = ../lib/libGmshAdapt.a
 INCLUDE   = -I../Common -I../DataStr
 
 OPT_FLAGS     = -g -Wall
diff --git a/Box/Makefile b/Box/Makefile
index 29bdc2d2561fafc7579d9a1e48d107933325332c..f9e6bcee61ecf70ff3fc1f8936ab7d101824e2d0 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.14 2001-10-30 09:52:30 geuzaine Exp $
+# $Id: Makefile,v 1.15 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libBox.a"
+# Makefile for "libGmshBox.a"
 #
 
 .IGNORE:
@@ -9,7 +9,7 @@ CXX      = c++
 AR       = ar ruvs
 RM       = rm
 RANLIB   = ranlib
-LIB      = ../lib/libBox.a
+LIB      = ../lib/libGmshBox.a
 INCLUDE  = -I../Common -I../DataStr -I../Geo\
            -I../Graphics -I../Mesh -I../Parser -I../Fltk -I../Plugin -I../Parallel
 
diff --git a/Common/Makefile b/Common/Makefile
index d74e2c3018f3621e85bf20dbce77cacce8a9fcd8..99ea73b8e95e03e241d8a9be0242aa6dd7e31994 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.31 2002-02-22 16:43:41 geuzaine Exp $
+# $Id: Makefile,v 1.32 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libCommon.a"
+# Makefile for "libGmshCommon.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR      = ar ruvs
 RANLIB  = ranlib
 RM      = rm
 
-LIB     = ../lib/libCommon.a
+LIB     = ../lib/libGmshCommon.a
 INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics\
           -I../Mesh -I../Parser -I../Fltk
 
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 585d1542c5b5ab85252e4d33a7daed790d049455..04f78316204a76e60a06a22538c06066ac7a0a10 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.13 2001-08-20 08:25:23 geuzaine Exp $
+# $Id: Makefile,v 1.14 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libDataStr.a"
+# Makefile for "libGmshDataStr.a"
 #
 
 .IGNORE:
@@ -9,7 +9,7 @@ CXX      = c++
 AR       = ar ruvs
 RM       = rm
 RANLIB   = ranlib
-LIB      = ../lib/libDataStr.a
+LIB      = ../lib/libGmshDataStr.a
 INCLUDE  = -I../Common
 
 OPT_FLAGS     = -g -Wall
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 51c1aab05f09429d18f837aa1e5a7e43745837b3..6b1f4ee6904267a2de522afb010cddb2a7044250 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.31 2002-01-03 10:25:06 geuzaine Exp $
+# $Id: Makefile,v 1.32 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libFltk.a"
+# Makefile for "libGmshFltk.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR       = ar ruvs
 RM       = rm
 RANLIB   = ranlib
 
-LIB      = ../lib/libFltk.a
+LIB      = ../lib/libGmshFltk.a
 INCLUDE  = -I../Common -I../DataStr -I../Graphics -I../Geo\
            -I../Mesh -I../Parser -I../Fltk -I../Plugin -I../utils
 
diff --git a/Geo/Makefile b/Geo/Makefile
index 6a66fa8e614a246af1d1bfbec41d2f1da923f59b..38f1096b04570ced86d291f60b97f6b0dfaaad5d 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.28 2001-12-03 08:41:43 geuzaine Exp $
+# $Id: Makefile,v 1.29 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libGeo.a"
+# Makefile for "libGmshGeo.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR      = ar ruvs
 RANLIB  = ranlib
 RM      = rm
 
-LIB       = ../lib/libGeo.a
+LIB       = ../lib/libGmshGeo.a
 INCLUDE   = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Parser\
             -I../Fltk
 
diff --git a/Graphics/Makefile b/Graphics/Makefile
index d37e9c48510367c5be155470df36ed9db5801023..6d5fa8f03030073cce4680d3c46eda41e808814a 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.35 2001-12-04 10:47:39 geuzaine Exp $
+# $Id: Makefile,v 1.36 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libGraphics.a"
+# Makefile for "libGmshGraphics.a"
 #
 
 .IGNORE:
@@ -9,7 +9,7 @@ CXX      = c++
 AR       = ar ruvs
 RANLIB   = ranlib
 RM       = rm
-LIB      = ../lib/libGraphics.a
+LIB      = ../lib/libGmshGraphics.a
 INCLUDE  = -I../Common -I../DataStr -I../Geo -I../Graphics\
            -I../Fltk -I../Mesh -I../Parser -I../jpeg
 
diff --git a/Makefile b/Makefile
index ff72e01445f67bf09ba4b4e48290886600df032c..813f5bc1fd31203286b78fa06af1dc4dc2d2a34b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.209 2002-04-30 21:36:31 geuzaine Exp $
+# $Id: Makefile,v 1.210 2002-05-18 00:55:14 geuzaine Exp $
 
 GMSH_MAJOR_VERSION = 1
 GMSH_MINOR_VERSION = 35
@@ -26,10 +26,11 @@ GMSH_DEMO_DIR = demos
 GMSH_TUTORIAL_DIR = tutorial
 GMSH_ARCHIVE_DIR = archives
 
-GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo -lAdapt\
-               -lPlugin -lCommon -lDataStr -lParallel -lTriangle
-GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lFltk -lParser -lGraphics -lMesh\
-                -lGeo -lAdapt -lCommon -lDataStr -lJpeg -lPlugin -lParallel -lTriangle
+GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo -lGmshAdapt\
+               -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshParallel -lGmshTriangle
+GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh\
+                -lGmshGeo -lGmshAdapt -lGmshCommon -lGmshDataStr -lGmshJpeg -lGmshPlugin\
+                -lGmshParallel -lGmshTriangle
 
 GMSH_RELEASE = $(GMSH_MAJOR_VERSION).$(GMSH_MINOR_VERSION).$(GMSH_PATCH_VERSION)
 GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"`
@@ -634,10 +635,10 @@ compile-macosx: initialtag
            "OS_FLAGS=" \
            "VERSION_FLAGS=-D_FLTK -D_NODLL" \
            "GL_INCLUDE=" \
-           "GUI_INCLUDE=-I$(HOME)/Projects/fltk" \
+           "GUI_INCLUDE=-I../../fltk" \
         ); done
 link-macosx:
-	$(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) -L../fltk/lib -lfltk_gl -lfltk_base \
+	$(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) -L../fltk/lib -lfltk_gl -lfltk \
                -framework AGL -framework OpenGL -framework Carbon -framework ApplicationServices
 	/Developer/Tools/Rez -t APPL -o $(GMSH_BIN_DIR)/gmsh ../fltk/FL/mac.r
 macosx: compile-macosx link-macosx
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 43942c591b904b2492e9167e0ae3cb6fb12561cd..416c6d3b74b6350ac1d79ce88adc0f9c0fa58f1f 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.39 2001-12-16 05:16:37 remacle Exp $
+# $Id: Makefile,v 1.40 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libMesh.a"
+# Makefile for "libGmshMesh.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR      = ar ruvs
 RM      = rm
 RANLIB  = ranlib
 
-LIB     = ../lib/libMesh.a
+LIB     = ../lib/libGmshMesh.a
 INCLUDE = -I../Adapt -I../Common -I../DataStr -I../Geo -I../Mesh\
           -I../Graphics -I../Parser -I../Fltk -I../Triangle
 
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 724ed33d79fdba908f26ea6ca95645a8631b1796..1b62a4993acbbd06df884a198cfee86256392bad 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,13 +1,13 @@
-# $Id: Makefile,v 1.8 2002-04-13 04:01:09 geuzaine Exp $
+# $Id: Makefile,v 1.9 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libParallel.a"
+# Makefile for "libGmshParallel.a"
 #
 
 .IGNORE:
 AR       = ar ruvs
 RM       = rm
 RANLIB   = ranlib
-LIB      = ../lib/libParallel.a
+LIB      = ../lib/libGmshParallel.a
 CC       = gcc
 
 OPT_FLAGS     = -g
diff --git a/Parser/Makefile b/Parser/Makefile
index 25d74155dad61e9dd386b85c46598c1e828c5d4d..b95ddac75eba5206153bd75cb177ac4acdd9550e 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.36 2002-02-22 16:43:41 geuzaine Exp $
+# $Id: Makefile,v 1.37 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libParser.a"
+# Makefile for "libGmshParser.a"
 #
 
 .IGNORE:
@@ -12,7 +12,7 @@ RM       = rm
 YACC     = bison
 LEX      = flex
 
-LIB      = ../lib/libParser.a
+LIB      = ../lib/libGmshParser.a
 INCLUDE  = -I../Common -I../DataStr -I../Geo -I../Graphics\
            -I../Mesh -I../Fltk -I../Plugin -I../Parallel
 
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 62e42cf5338683c4c5dea620ee81c503f746d5c1..acf0991b7f618a8039a0b58b262c9e4a80a474fc 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.22 2001-11-05 11:25:11 geuzaine Exp $
+# $Id: Makefile,v 1.23 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libAdapt.a"
+# Makefile for "libGmshPlugin.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR        = ar ruvs
 RM        = rm
 RANLIB    = ranlib
 
-LIB       = ../lib/libPlugin.a
+LIB       = ../lib/libGmshPlugin.a
 INCLUDE   = -I../Common -I../Graphics -I../DataStr -I../Geo -I../Mesh -I../Triangle
 
 OPT_FLAGS     = -g -Wall
diff --git a/Triangle/Makefile b/Triangle/Makefile
index 25d23f8800d4435fa401b9a2bde5965ace0c3bbc..1cf37ea5f1a3cf16aab2144f2b3952517b9e9fc7 100644
--- a/Triangle/Makefile
+++ b/Triangle/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.4 2001-10-31 16:33:46 remacle Exp $
+# $Id: Makefile,v 1.5 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libTriangle.a"
+# Makefile for "libGmshTriangle.a"
 #
 # If yours is not a Unix system, use the -DNO_TIMER switch to eliminate the
 #   Unix-specific timer code.
@@ -29,7 +29,7 @@ AR       = ar ruvs
 RM       = rm
 RANLIB   = ranlib
 
-LIB     = ../lib/libTriangle.a
+LIB     = ../lib/libGmshTriangle.a
 
 RMFLAGS  = -f
 
diff --git a/jpeg/Makefile b/jpeg/Makefile
index 41e35cafb43e836c5a4f9882fef041d2d2db9d76..dae1af57e0bcb851fea6a876fe4d7756b2f9fda5 100644
--- a/jpeg/Makefile
+++ b/jpeg/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.21 2001-08-20 08:25:24 geuzaine Exp $
+# $Id: Makefile,v 1.22 2002-05-18 00:55:14 geuzaine Exp $
 #
-# Makefile for "libJpeg.a"
+# Makefile for "libGmshJpeg.a"
 #
 
 .IGNORE:
@@ -10,7 +10,7 @@ AR       = ar ruvs
 RM       = rm
 RANLIB   = ranlib
 
-LIB      = ../lib/libJpeg.a
+LIB      = ../lib/libGmshJpeg.a
 INCLUDE  = -I.
 
 OPT_FLAGS     = -g -Wall