diff --git a/src/main/java/com/r35157/nenjim/hubd/NenjimDependency.java b/src/main/java/com/r35157/nenjim/hubd/Dependency.java
similarity index 84%
rename from src/main/java/com/r35157/nenjim/hubd/NenjimDependency.java
rename to src/main/java/com/r35157/nenjim/hubd/Dependency.java
index a792a50..a29b637 100644
--- a/src/main/java/com/r35157/nenjim/hubd/NenjimDependency.java
+++ b/src/main/java/com/r35157/nenjim/hubd/Dependency.java
@@ -3,7 +3,7 @@ package com.r35157.nenjim.hubd;
 import org.jetbrains.annotations.NotNull;
 import com.r35157.nenjim.valuetypes.NenjimJournalId;
 
-public record NenjimDependency(
+public record Dependency(
         @NotNull NenjimJournalId dependencyId
 ) {
 }
diff --git a/src/main/java/com/r35157/nenjim/hubd/NenjimJournal.java b/src/main/java/com/r35157/nenjim/hubd/Journal.java
similarity index 65%
rename from src/main/java/com/r35157/nenjim/hubd/NenjimJournal.java
rename to src/main/java/com/r35157/nenjim/hubd/Journal.java
index 8c8c901..86360f4 100644
--- a/src/main/java/com/r35157/nenjim/hubd/NenjimJournal.java
+++ b/src/main/java/com/r35157/nenjim/hubd/Journal.java
@@ -5,17 +5,18 @@ import com.r35157.nenjim.valuetypes.NenjimJournalId;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 
-public record NenjimJournal (
+public record Journal(
     @NotNull NenjimJournalId id,
     @NotNull String name,
-    @NotNull Set<NenjimRelease> releases
+    @NotNull Set<Release> releases
 ) {
-    public NenjimRelease getRelease(SemanticVersion version) {
-        Dependencies dependencies = new Dependencies();
+    public Release getRelease(SemanticVersion version) {
+        Set<Dependency> dependencies = new HashSet<>();
 
-        return new NenjimRelease(
+        return new Release(
                 new SemanticVersion(0, 1, 0),
                 new Date(),
                 null,
diff --git a/src/main/java/com/r35157/nenjim/hubd/Dependencies.java b/src/main/java/com/r35157/nenjim/hubd/Module.java
similarity index 50%
rename from src/main/java/com/r35157/nenjim/hubd/Dependencies.java
rename to src/main/java/com/r35157/nenjim/hubd/Module.java
index 00db62d..c97b23c 100644
--- a/src/main/java/com/r35157/nenjim/hubd/Dependencies.java
+++ b/src/main/java/com/r35157/nenjim/hubd/Module.java
@@ -1,4 +1,4 @@
 package com.r35157.nenjim.hubd;
 
-public record Dependencies(
-) {}
+public record Module() {
+}
diff --git a/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java b/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java
index 7c42830..6c40cd5 100644
--- a/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java
+++ b/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java
@@ -12,6 +12,6 @@ public interface NenjimHub {
      *
      * @param journal
      */
-    void monitorJournal(@NotNull NenjimJournal journal);
+    void monitorJournal(@NotNull Journal journal);
 }
 
diff --git a/src/main/java/com/r35157/nenjim/hubd/NenjimRelease.java b/src/main/java/com/r35157/nenjim/hubd/Release.java
similarity index 78%
rename from src/main/java/com/r35157/nenjim/hubd/NenjimRelease.java
rename to src/main/java/com/r35157/nenjim/hubd/Release.java
index fad85ac..2ed18a9 100644
--- a/src/main/java/com/r35157/nenjim/hubd/NenjimRelease.java
+++ b/src/main/java/com/r35157/nenjim/hubd/Release.java
@@ -5,10 +5,11 @@ import com.r35157.libs.valuetypes.basic.SemanticVersion;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Date;
+import java.util.Set;
 
-public record NenjimRelease(
+public record Release(
         @NotNull SemanticVersion version,
         @NotNull Date releaseDate,
         @NotNull Checksum checksum,
-        @NotNull Dependencies dependencies
+        @NotNull Set<Dependency> dependencies
 ) {}