diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java
index 783db3fba52a3..855efaca12169 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java
@@ -1,7 +1,7 @@
 package org.openhab.io.imperihome.internal.model;
 
 /**
- * FIXME: JavaDoc
+ * Room data object.
  * @author pdegeus
  */
 public class Room {
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java
index 36237107d148a..d00b3f501eefa 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 
 /**
- * FIXME: JavaDoc
+ * Room list data object.
  * @author pdegeus
  */
 public class RoomList {
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java
index 39fa0d33d7c36..193aff502b72a 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java
@@ -1,7 +1,7 @@
 package org.openhab.io.imperihome.internal.model;
 
 /**
- * FIXME: JavaDoc
+ * System data object.
  * @author pdegeus
  */
 public class System {
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java
index f3f7671bdfc06..9afa4c4744c81 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java
@@ -12,7 +12,7 @@
 import org.openhab.io.imperihome.internal.model.device.AbstractDevice;
 
 /**
- * FIXME: JavaDoc
+ * The device registry stores created devices by ID.
  * @author pdegeus
  */
 public class DeviceRegistry implements Iterable<AbstractDevice> {
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java
index 043e95ef3ccb5..aeb8747fe56c6 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java
@@ -6,7 +6,7 @@
 import java.security.NoSuchAlgorithmException;
 
 /**
- * FIXME: JavaDoc
+ * Digest utility.
  * @author pdegeus
  */
 public final class DigestUtil {