diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/FFLauncher.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java
similarity index 97%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/FFLauncher.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java
index 6e9273626..ef570be2b 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/FFLauncher.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/FFLauncherDiscreteScheduler.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncherDiscreteScheduler.java
similarity index 97%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/FFLauncherDiscreteScheduler.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncherDiscreteScheduler.java
index d6ee83e4d..687c5d2b2 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/FFLauncherDiscreteScheduler.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncherDiscreteScheduler.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/GroupLeader.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupLeader.java
similarity index 98%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/GroupLeader.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupLeader.java
index 5824441f7..a7d3c5ae5 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/GroupLeader.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupLeader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/GroupMember.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupMember.java
similarity index 97%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/GroupMember.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupMember.java
index 4072bf9db..30e9d9b9c 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/GroupMember.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupMember.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import java.util.Random;
 
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/Position.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/Position.java
similarity index 93%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/Position.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/Position.java
index 37a918b2f..1eb02c0ab 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/Position.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/Position.java
@@ -1,4 +1,4 @@
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import cz.cuni.mff.d3s.deeco.knowledge.Knowledge;
 
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/SensorDataEnsemble.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/SensorDataEnsemble.java
similarity index 97%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/SensorDataEnsemble.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/SensorDataEnsemble.java
index d0a71d898..f7ec1e19f 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/SensorDataEnsemble.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/SensorDataEnsemble.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import java.util.Map;
 
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/StrategicInformationEnsemble.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/StrategicInformationEnsemble.java
similarity index 97%
rename from jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/StrategicInformationEnsemble.java
rename to jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/StrategicInformationEnsemble.java
index 80fa97920..bdce5387f 100644
--- a/jdeeco-demo/src/cz/cuni/mff/d3s/jdeeco/demo/firefighters/StrategicInformationEnsemble.java
+++ b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/StrategicInformationEnsemble.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package cz.cuni.mff.d3s.jdeeco.demo.firefighters;
+package cz.cuni.mff.d3s.deeco.demo.firefighters;
 
 import java.util.Set;