diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index ebec02c683a408c07901f0a3f8bc8f8e72f5caf9..9e2684a465001ac19c07c10e78430f2f7e819ba0 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * VIPSCore is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
@@ -56,7 +56,5 @@ public class VIPSCoreApplication extends Application
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(no.bioforsk.vips.core.config.JacksonConfig.class);
-        resources.add(no.bioforsk.vips.core.service.ModelResource.class);
-        resources.add(no.bioforsk.vips.coremanager.service.ManagerResource.class);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
index 9a3564b76ac37a67e5ff5e0d27da704c1a0efe71..260b2754bf4654db4c1a645372b046419def9e07 100644
--- a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
+++ b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * VIPSCore is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
index e984c45a6eccaa6978291a152d53d8d802a259d7..40a3b54a27d104cf81bed857f563622392f73cd8 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * VIPSCore is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java b/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
index b5ea0e3e00af8a4dccd9a91264d34dd44bc1f029..56078c740530d97679dc85b30337d94bbf6fa716 100644
--- a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
+++ b/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * VIPSCore is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java b/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
index 3f2a89be6193e26dae3d53e579abdf88a112a82b..40f1bb0da353cf9b22f36f0280ea46c6d36700e2 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
+++ b/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * VIPSCore is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
index 4376fdec5ae11f262f7296e971677f014230019b..9b64ae1d311ba988d584bb60d7fccb000029b9dc 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
+++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * VIPSCore is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index ea41c789aef2ab49cce3cd1ea4de0525a2cc088c..3adbe1f8df5c1d28fbe8b85fdb6d4bc6b024dd73 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -2,19 +2,19 @@
 <!--
   Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  
-  This file is part of VIPSLogic.
-  VIPSLogic is free software: you can redistribute it and/or modify
+  This file is part of VIPSCore.
+  VIPSCore is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   
-  VIPSLogic is distributed in the hope that it will be useful,
+  VIPSCore is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   
   You should have received a copy of the GNU Affero General Public License
-  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+  along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <jboss-web>
   <context-root>/VIPSCore</context-root>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 68893843d081cea3cfab88a7d9b61190f3a46671..7b690952d925194a309feca8de17707ae326720e 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -2,19 +2,19 @@
 <!--
   Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  
-  This file is part of VIPSLogic.
-  VIPSLogic is free software: you can redistribute it and/or modify
+  This file is part of VIPSCore.
+  VIPSCore is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   
-  VIPSLogic is distributed in the hope that it will be useful,
+  VIPSCore is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   
   You should have received a copy of the GNU Affero General Public License
-  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+  along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <listener>