diff --git a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/Bookmark.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java
rename to src/main/java/eu/mulk/mulkcms2/benki/bookmarks/Bookmark.java
index d021290..783a882 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/Bookmark.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.benki.bookmarx;
+package eu.mulk.mulkcms2.benki.bookmarks;
 
 import eu.mulk.mulkcms2.benki.generic.Post;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkTag.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java
rename to src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkTag.java
index 32136b7..ce2d1c6 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkTag.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.benki.bookmarx;
+package eu.mulk.mulkcms2.benki.bookmarks;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTagPK.java b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkTagPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTagPK.java
rename to src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkTagPK.java
index 876648d..e8abb3b 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTagPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkTagPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.benki.bookmarx;
+package eu.mulk.mulkcms2.benki.bookmarks;
 
 import java.io.Serializable;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java b/src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatMessage.java
similarity index 93%
rename from src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java
rename to src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatMessage.java
index d3fbf2e..de1e0cc 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatMessage.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.benki.lafargue;
+package eu.mulk.mulkcms2.benki.lazychat;
 
 import eu.mulk.mulkcms2.benki.generic.Post;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java b/src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatReference.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java
rename to src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatReference.java
index 2cf34d1..eecc23e 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatReference.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.benki.lafargue;
+package eu.mulk.mulkcms2.benki.lazychat;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReferencePK.java b/src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatReferencePK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReferencePK.java
rename to src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatReferencePK.java
index 6e2d965..28ee2e0 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReferencePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/lazychat/LazychatReferencePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.benki.lafargue;
+package eu.mulk.mulkcms2.benki.lazychat;
 
 import java.io.Serializable;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
index c1ab89b..2a0d5f4 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
@@ -2,9 +2,9 @@
 
 import eu.mulk.mulkcms2.benki.accesscontrol.PageKey;
 import eu.mulk.mulkcms2.benki.accesscontrol.Role;
-import eu.mulk.mulkcms2.benki.bookmarx.Bookmark;
+import eu.mulk.mulkcms2.benki.bookmarks.Bookmark;
 import eu.mulk.mulkcms2.benki.generic.Post;
-import eu.mulk.mulkcms2.benki.lafargue.LazychatMessage;
+import eu.mulk.mulkcms2.benki.lazychat.LazychatMessage;
 import eu.mulk.mulkcms2.benki.wiki.WikiPageRevision;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/resources/templates/base.html b/src/main/resources/templates/base.html
index aec554a..b64f5fb 100644
--- a/src/main/resources/templates/base.html
+++ b/src/main/resources/templates/base.html
@@ -19,8 +19,8 @@
 
   <nav>
     <ol>
-      <li class="{#insert bookMarxClass}{/}" data-site-section="Book Marx"><a href="/bookmarx">Bookmarks</a></li>
-      <li class="{#insert lafargueClass}{/}" data-site-section="Lafargue"><a href="/lafargue">Remarks</a></li>
+      <li class="{#insert bookmarksClass}{/}" data-site-section="Book Marx"><a href="/bookmarks">Bookmarks</a></li>
+      <li class="{#insert lazychatClass}{/}" data-site-section="Lafargue"><a href="/lazychat">Lazy Chat</a></li>
       <li class="{#insert wikiClass}{/}" data-site-section="Wiki"><a href="/wiki">Wiki</a></li>
     </ol>
   </nav>