diff --git a/nb-configuration.xml b/nb-configuration.xml
index 33e441e8278864cc0db17e7c047d6f8753813a93..7103095542c1a062dedf6d7f32faa28c80b6c0de 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license>
+        <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
     </properties>
 </project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 1ed9dfd842123f6714bc1a9c57c091cf6ae4d897..270f0bb521155c08a2d9b2fd9feb6275f9b44594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>no.bioforsk.vips</groupId>
+    <groupId>no.nibio.vips</groupId>
     <artifactId>DeliaRadicumModel</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
-            <groupId>no.bioforsk.vips.common</groupId>
+            <groupId>no.nibio.vips.common</groupId>
             <artifactId>VIPSCommon</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>jar</type>
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
index 48608bab956f2a066face9da009711656ead54af..e3cf007048a96eea32285e26d1c1d15119ab9440 100644
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
@@ -27,20 +27,20 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.ResultImpl;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.i18n.I18nImpl;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.Model;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.model.ModelId;
-import no.bioforsk.vips.util.CommonNamespaces;
-import no.bioforsk.vips.util.InvalidAggregationTypeException;
-import no.bioforsk.vips.util.WeatherElements;
-import no.bioforsk.vips.util.WeatherObservationListException;
-import no.bioforsk.vips.util.WeatherUtil;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.ResultImpl;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.i18n.I18nImpl;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.Model;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.model.ModelId;
+import no.nibio.vips.util.CommonNamespaces;
+import no.nibio.vips.util.InvalidAggregationTypeException;
+import no.nibio.vips.util.WeatherElements;
+import no.nibio.vips.util.WeatherObservationListException;
+import no.nibio.vips.util.WeatherUtil;
 
 /**
  * Model controller for aggregated temperature model for invasion of
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
index 7e89c4eb0829d38c858485dabaa3371fca72fdca..f053fd5cb5b9929f458dbd3b2d0538d0b929e5c0 100644
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
@@ -19,7 +19,7 @@
 
 package no.nibio.vips.model.deliaradicummodel;
 
-import no.bioforsk.vips.util.DateMap;
+import no.nibio.vips.util.DateMap;
 
 /**
  * @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a>
diff --git a/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java b/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
index 97fd64b0606a0c2cb1be0bb4f09b12ad01eb3c97..7b3e91e8297f7f3345baafac0d5f4671d979a35c 100644
--- a/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
+++ b/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
@@ -32,10 +32,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 import static junit.framework.Assert.fail;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.model.ModelId;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.model.ModelId;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;