diff --git a/ctatools.pc.in b/ctools.pc.in
index ee20469..4553e8f 100644
--- a/ctatools.pc.in
+++ b/ctools.pc.in
@@ -3,13 +3,13 @@ exec_prefix=@exec_prefix@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: ctatools
+Name: ctools
 Description: CTA science analysis tools
-URL: http://cta.irap.omp.eu/ctatools
+URL: http://cta.irap.omp.eu/ctools
 Version: 0.2.5
 Requires: 
 Requires.private: GammaLib >= 0.4.11
 Conflicts: 
-Cflags: -I${includedir}/ctatools
-Libs: -L${libdir} -lctatools
+Cflags: -I${includedir}/ctools
+Libs: -L${libdir} -lctools
 Libs.private: 
\ No newline at end of file
diff --git a/ctatools.sh b/ctools.sh
index 30b0940..53bffb7 100755
--- a/ctatools.sh
+++ b/ctools.sh
@@ -3,30 +3,28 @@
 # Set parameters
 installdir=$(pwd)/build
 
-echo "Checkout latest ctatools"
-rm -rf ctatools
-cvs -Q -d /home/cvs export -N -r HEAD "ctatools"
+echo "Checkout latest ctools"
+rm -rf ctools
+cvs -Q -d /home/cvs export -N -r HEAD "ctools"
 
 # Extract version number
-version=`cat ctatools/configure.ac | grep 'AC_INIT' | awk -F"[" '{print $3}' | sed 's/],//' | sed 's/\./ /g'`
+version=`cat ctools/configure.ac | grep 'AC_INIT' | awk -F"[" '{print $3}' | sed 's/],//' | sed 's/\./ /g'`
 version=`printf "%2.2d-%2.2d-%2.2d" $version`
-echo "ctatools version: "$version
+echo "ctools version: "$version
 
 # Set directory name
-sourcedir=ctatools-$version
+sourcedir=ctools-$version
 rm -rf $sourcedir
-mv ctatools $sourcedir
+mv ctools $sourcedir
 
 echo "Create Makefile.in and configure scripts"
 cd $sourcedir
-#mkdir m4
 ./autogen.sh
-#rm -rf autom4te.cache
-rm -f ctatools.sh
+rm -f ctools.sh
 cd ..
 
-echo "Create ctatool_wrap.cpp and ctatool.py files for python binding (making swig obsolete)"
-swig -c++ -python -Wall -includeall -I$installdir/share/gammalib/swig -o $sourcedir/pyext/ctatools_wrap.cpp -outdir $sourcedir/pyext $sourcedir/pyext/ctatools.i
+echo "Create ctool_wrap.cpp and ctool.py files for python binding (making swig obsolete)"
+swig -c++ -python -Wall -includeall -I$installdir/share/gammalib/swig -o $sourcedir/pyext/ctools_wrap.cpp -outdir $sourcedir/pyext $sourcedir/pyext/ctools.i
 
 echo "Make files read/write"
 chmod -R u+rw $sourcedir
@@ -36,15 +34,15 @@ tar cvf - $sourcedir > $sourcedir.tar
 rm -f $sourcedir.tar.gz
 gzip $sourcedir.tar
 
-echo "Configure ctatools"
+echo "Configure ctools"
 cd $sourcedir
 ./configure --prefix=$installdir
 
-echo "Compile ctatools"
+echo "Compile ctools"
 make -j10
 
-echo "Check ctatools"
+echo "Check ctools"
 make check
 
-echo "Install ctatools"
+echo "Install ctools"
 make install