diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 6b058b9..f1f9aba 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -11,7 +11,7 @@
             <dependency-type>consumes</dependency-type>
         </dependent-module>
         <property name="context-root" value="ibis4template"/>
-        <property name="java-output-path" value="/ibis4example/target/classes"/>
+        <property name="java-output-path" value="/ibis4template/target/classes"/>
         <property name="component.exclusion.patterns"/>
     </wb-module>
 </project-modules>
diff --git a/README.md b/README.md
index cbe4d19..9801ffc 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Eclipse
   Window, Preferences, Maven, User Settings, settings.xml should exist and contain proxy configuration.
 + Git  
   Window, Open Perspective, Other..., Git, OK,  
-  Clone a Git repository, URI: https://github.com/ibissource/ibis4example.git, Next, Next, Finish.
+  Clone a Git repository, URI: https://github.com/ibissource/ibis4template.git, Next, Next, Finish.
 + Install Server  
   If no servers are available. Click this link to create a new server...,  
   Apache, Tomcat v7.0 Server or higher, Next, Browse..., select the root folder of a Tomcat installation  
@@ -36,17 +36,17 @@ Eclipse
   Double click Tomcat v7.0 Server at localhost, Open launch configuration, Arguments, VM arguments, add ```-Dotap.stage=LOC```, OK  
   Next click Modules tab, Add Web Module..., iaf-example, OK, File, Save  
   Right click Tomcat v7.0 Server at localhost, Start.
-+ Start ibis4example on your local machine  
-  Open a webbrowser and goto [http://localhost:8080/ibis4example/](http://localhost:8080/ibis4example/) to check if ibis4example is running
++ Start ibis4template on your local machine  
+  Open a webbrowser and goto [http://localhost:8080/ibis4template/](http://localhost:8080/ibis4template/) to check if ibis4template is running
 
 ### Trouble shooting
 In some cases you might want/need to:
-- Rightclick ibis4example, Maven, Update Project..., OK.
+- Rightclick ibis4template, Maven, Update Project..., OK.
 - Enable Project, Build Automatically
 - Right click Tomcat v7.0 Server at localhost, Clean...
 - Change newlines in .classpath and org.eclipse.wst.common.component files
   back to Unix newlines.
-- Rightclick pom.xml (in ibis4example), Run As, Maven build..., JRE, make sure a JDK
+- Rightclick pom.xml (in ibis4template), Run As, Maven build..., JRE, make sure a JDK
   (not a JRE) is used, Refresh, Refresh resources upon completion,
 - The local Maven repository might contain corrupt jar files which for example
   will result in java.lang.NoClassDefFoundError:
diff --git a/buildspec.yml b/buildspec.yml
index 9c25ce0..0044020 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -7,4 +7,4 @@ phases:
 artifacts:
   files:
     - '**/*'
-  base-directory: target/ibis4example-*
+  base-directory: target/ibis4template-*
diff --git a/pom.xml b/pom.xml
index 1323abc..7efebce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>war</packaging>
 	<name>Ibis4Template</name>
 	<description>ibis template for new projects</description>
-	<url>ibis4example.ibissource.org</url>
+	<url>ibis4template.ibissource.org</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/resources/springCustom.xml b/src/main/resources/springCustom.xml
index f1cb6e2..285ab28 100644
--- a/src/main/resources/springCustom.xml
+++ b/src/main/resources/springCustom.xml
@@ -41,7 +41,7 @@
 
 	<!--
 	Overwrite jndiDataSource bean to prevent:
-	javax.naming.NameNotFoundException: Name ibis4example is not bound in this Context
+	javax.naming.NameNotFoundException: Name ibis4template is not bound in this Context
 	-->
 	<bean name="jndiDataSource" class="java.lang.String"/>