diff --git a/Makefile.am b/Makefile.am
index c5691141de87eecc5aa5fcec2265f8734c41aa31..491dce02a6ac70c35a0227fc84102eb10dfd136e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-# This file is part of GadgetSMP.
+# This file is part of SWIFT.
 # Coypright (c) 2012 pedro.gonnet@durham.ac.uk.
 # 
 # This program is free software: you can redistribute it and/or modify
diff --git a/configure.in b/configure.in
index 20826dad5d79f5b41151b0f9dca7d237425b1b3e..12b99798b4f75b477b4b0b772f458257dbcf3a4c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 
-# This file is part of GadgetSMP.
+# This file is part of SWIFT.
 # Coypright (c) 2012 pedro.gonnet@durham.ac.uk.
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 AC_INIT(src/space.c)
 VERSION="0.0.1"
 AC_SUBST(VERSION)
-AM_INIT_AUTOMAKE(GadgetSMP,VERSION)
+AM_INIT_AUTOMAKE(SWIFT,VERSION)
 AC_GNU_SOURCE
 AC_PROG_LIBTOOL
 
diff --git a/doc/Doxyfile b/doc/Doxyfile
index c0779504cafae29026a6b87d9be52e8345c21f65..94f05fba32f5bd456ed5aa18ec6273e8f7dde3c8 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = GadgetSMP
+PROJECT_NAME           = SWIFT
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ab653f6d9a7b13c44b3e4686eb67e740c5deb01d..5a2f58bf6d83da14d53915fb4f562c58778dd8b3 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 
-# This file is part of GadgetSMP.
+# This file is part of SWIFT.
 # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
 #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
 # 
@@ -30,5 +30,5 @@ bin_PROGRAMS = test
 # Sources for test
 test_SOURCES = test.c
 test_CFLAGS = -DCOUNTER -DTIMER $(AM_CFLAGS)
-test_LDADD =  ../src/.libs/libgadgetsmp.a $(HDF5_LDFLAGS)
+test_LDADD =  ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS)
 
diff --git a/examples/test.c b/examples/test.c
index 36ead64386c0fa652e0e6b8b95f2861ba95ee10e..72d279bb14c823df43d55a943812ccacd81b57e0 100644
--- a/examples/test.c
+++ b/examples/test.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  * 
@@ -36,7 +36,7 @@
 #endif
 
 /* Local headers. */
-#include "gadgetsmp.h"
+#include "swift.h"
 
 /* Ticks per second on this machine. */
 #ifndef CPU_TPS
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d1cfd49713c79e98a109529122c27029991d364..2843feadaa0eaeecfec9e328c68f9f776901b2bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-# This file is part of GadgetSMP.
+# This file is part of SWIFT.
 # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
 #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
 # 
@@ -27,11 +27,11 @@ AM_CFLAGS = -g -O3 -Wall -Werror -ffast-math -fstrict-aliasing -ftree-vectorize
 # Assign a "safe" version number
 AM_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(HDF5_LDFLAGS) -version-info 0:0:0
 
-# Build the libgadgetsmp library
-lib_LTLIBRARIES = libgadgetsmp.la
-libgadgetsmp_la_SOURCES = space.c runner.c queue.c task.c cell.c engine.c ic.c
+# Build the libswiftsim library
+lib_LTLIBRARIES = libswiftsim.la
+libswiftsim_la_SOURCES = space.c runner.c queue.c task.c cell.c engine.c ic.c
 
 # List required headers
 include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
-    engine.h gadgetsmp.h ic.h
+    engine.h swift.h ic.h
 
diff --git a/src/cell.c b/src/cell.c
index 86ff7b2ee78f001986b375dcccb5e4920a4e89cf..de3ab0d008bcb72a7f45e8c4634d165a02cec73a 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/cell.h b/src/cell.h
index 7d97599c064a7617f4b58c7f8373d405da056742..b5f145c5e87aded11a320e07439d13c010de17d7 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/const.h b/src/const.h
index 40997092852edb5e45f9a89853b50002c108f5f9..ab553a0b0cb6b143bfa03b3d7497d15da0ea4819 100644
--- a/src/const.h
+++ b/src/const.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/engine.c b/src/engine.c
index 62b9273db671e667eb46e4fb66261d1a09fff491..bf34944c4b4cf3b1a3b21c8822e9e76682ac530d 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/engine.h b/src/engine.h
index d3319f2d81ed91c0ddfae02710fc6827ff95f7e5..71b417e34fa6510228a4ce345255a8c35eaafd93 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/ic.c b/src/ic.c
index c8cdfe8880b1d364314417c17db1528a88698a21..65a083f782550a13192d4a5a9e2c2926238e5f83 100644
--- a/src/ic.c
+++ b/src/ic.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  * 
diff --git a/src/ic.h b/src/ic.h
index bcacfddad0ca72fa8951c30203d6cff46ead5f48..f7f20611381f7294be38d4a2d31c265af0bb0675 100644
--- a/src/ic.h
+++ b/src/ic.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/lock.h b/src/lock.h
index 9ff386119e720b95f1da4a36b7bab5ffc2eb909f..db4a76e83f3939c4ff2d33ad0397b35be2d8045f 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/part.h b/src/part.h
index 32adceb9d058d0f52e91633689c8751bba680a00..2c69755d4e4d89e9377e00dee23fae10a089e250 100644
--- a/src/part.h
+++ b/src/part.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/queue.c b/src/queue.c
index ca248da6f74872f27905a2f01023c954c04241f6..f6199d6e9db6220290bf790233d53bb59a3e5e29 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/queue.h b/src/queue.h
index 491a8e718fa883cadd1cdbfd91ac39918d846f87..2db5b57c04f92ef5b3809ca77167d0fbce8ae780 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/runner.c b/src/runner.c
index 63489d8547f28db4e199ca8ea689174a0eeedc89..2c1f89019ee5b3c4cb7fa54e677de63033a4810b 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/runner.h b/src/runner.h
index 4bb83a460fe58c1aed945f22758c30bd8e5a516c..1ed2a5a4ee81afb2573543997e5a28f118dd7441 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index 7372c23277c5df7d021dd11ee5c22592b139365d..b2490bccc8ca591faf85f0abbee56b359ee4be30 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/runner_iact.h b/src/runner_iact.h
index fff1382fc08bb8070fc1e4fb4545eb56c39eb30c..514234558d7ec638bf86c32ee19e3ab0abbbfeb2 100644
--- a/src/runner_iact.h
+++ b/src/runner_iact.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/space.c b/src/space.c
index baedadd39bc92892824c4b6c7f672e989d503572..91bde77893ab6d6de3b06b1bffcf049e15ebd738 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/space.h b/src/space.h
index 2dc0f8878f7404942bf1bd975826183284893c58..77911743010597c2b37c42291ac9ba4a28d2b294 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/task.c b/src/task.c
index a4c3eb5fba51f863c8614745a343c8c84f08fc14..60eb196df1accc4f71a95878664a28ce01651a2f 100644
--- a/src/task.c
+++ b/src/task.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/task.h b/src/task.h
index 662d838decbb6d98e67cab4df418bf53acf6da50..caabe12ab4ca84ca0c6e202c21e251fb2bc2ee4e 100644
--- a/src/task.h
+++ b/src/task.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * This file is part of GadgetSMP.
+ * This file is part of SWIFT.
  * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify
diff --git a/theory/paper_algs/paper.tex b/theory/paper_algs/paper.tex
index a539ab9e2ff95a7ee7aa487cc9927773c9ebe571..95f4ce3cd770d1fd6111965aaeb366fd9c7f0827 100644
--- a/theory/paper_algs/paper.tex
+++ b/theory/paper_algs/paper.tex
@@ -875,7 +875,7 @@ void cell_unlocktree ( struct cell c ) {
         are shown in \fig{Results}.
         
     \item The new simulation code not only scales much better, e.g. achieving
-        a parallel efficiency of 63\% at 32 cores.
+        a parallel efficiency of 73\% at 32 cores.
 
 \end{itemize}