diff --git a/config.json b/config.json
index b1e2f0ac2..7cf0a3dbe 100644
--- a/config.json
+++ b/config.json
@@ -561,7 +561,7 @@
         "difficulty": 3
       },
       {
-        "slug": "pop-count",
+        "slug": "eliuds-eggs",
         "name": "Eliud's Eggs",
         "uuid": "2d5b6404-3315-48c1-892f-b594a960e7a1",
         "practices": [],
diff --git a/exercises/practice/pop-count/.docs/instructions.md b/exercises/practice/eliuds-eggs/.docs/instructions.md
similarity index 100%
rename from exercises/practice/pop-count/.docs/instructions.md
rename to exercises/practice/eliuds-eggs/.docs/instructions.md
diff --git a/exercises/practice/pop-count/.docs/introduction.md b/exercises/practice/eliuds-eggs/.docs/introduction.md
similarity index 100%
rename from exercises/practice/pop-count/.docs/introduction.md
rename to exercises/practice/eliuds-eggs/.docs/introduction.md
diff --git a/exercises/practice/pop-count/.meta/config.json b/exercises/practice/eliuds-eggs/.meta/config.json
similarity index 77%
rename from exercises/practice/pop-count/.meta/config.json
rename to exercises/practice/eliuds-eggs/.meta/config.json
index 0ad58ea9a..0659502f2 100644
--- a/exercises/practice/pop-count/.meta/config.json
+++ b/exercises/practice/eliuds-eggs/.meta/config.json
@@ -4,13 +4,13 @@
   ],
   "files": {
     "solution": [
-      "src/main/java/PopCount.java"
+      "src/main/java/EliudsEggs.java"
     ],
     "test": [
-      "src/test/java/PopCountTest.java"
+      "src/test/java/EliudsEggsTest.java"
     ],
     "example": [
-      ".meta/src/reference/java/PopCount.java"
+      ".meta/src/reference/java/EliudsEggs.java"
     ],
     "invalidator": [
       "build.gradle"
diff --git a/exercises/practice/pop-count/.meta/src/reference/java/PopCount.java b/exercises/practice/eliuds-eggs/.meta/src/reference/java/EliudsEggs.java
similarity index 91%
rename from exercises/practice/pop-count/.meta/src/reference/java/PopCount.java
rename to exercises/practice/eliuds-eggs/.meta/src/reference/java/EliudsEggs.java
index 5f6a08f2e..e16d4dff4 100644
--- a/exercises/practice/pop-count/.meta/src/reference/java/PopCount.java
+++ b/exercises/practice/eliuds-eggs/.meta/src/reference/java/EliudsEggs.java
@@ -1,4 +1,4 @@
-public class PopCount {
+public class EliudsEggs {
     public int eggCount(int number) {
         var count = 0;
         var remaining = number;
diff --git a/exercises/practice/pop-count/.meta/tests.toml b/exercises/practice/eliuds-eggs/.meta/tests.toml
similarity index 100%
rename from exercises/practice/pop-count/.meta/tests.toml
rename to exercises/practice/eliuds-eggs/.meta/tests.toml
diff --git a/exercises/practice/pop-count/build.gradle b/exercises/practice/eliuds-eggs/build.gradle
similarity index 100%
rename from exercises/practice/pop-count/build.gradle
rename to exercises/practice/eliuds-eggs/build.gradle
diff --git a/exercises/practice/pop-count/gradle/wrapper/gradle-wrapper.jar b/exercises/practice/eliuds-eggs/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from exercises/practice/pop-count/gradle/wrapper/gradle-wrapper.jar
rename to exercises/practice/eliuds-eggs/gradle/wrapper/gradle-wrapper.jar
diff --git a/exercises/practice/pop-count/gradle/wrapper/gradle-wrapper.properties b/exercises/practice/eliuds-eggs/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from exercises/practice/pop-count/gradle/wrapper/gradle-wrapper.properties
rename to exercises/practice/eliuds-eggs/gradle/wrapper/gradle-wrapper.properties
diff --git a/exercises/practice/pop-count/gradlew b/exercises/practice/eliuds-eggs/gradlew
similarity index 100%
rename from exercises/practice/pop-count/gradlew
rename to exercises/practice/eliuds-eggs/gradlew
diff --git a/exercises/practice/pop-count/gradlew.bat b/exercises/practice/eliuds-eggs/gradlew.bat
similarity index 100%
rename from exercises/practice/pop-count/gradlew.bat
rename to exercises/practice/eliuds-eggs/gradlew.bat
diff --git a/exercises/practice/pop-count/src/main/java/PopCount.java b/exercises/practice/eliuds-eggs/src/main/java/EliudsEggs.java
similarity index 85%
rename from exercises/practice/pop-count/src/main/java/PopCount.java
rename to exercises/practice/eliuds-eggs/src/main/java/EliudsEggs.java
index 207cc22ce..b31032aaa 100644
--- a/exercises/practice/pop-count/src/main/java/PopCount.java
+++ b/exercises/practice/eliuds-eggs/src/main/java/EliudsEggs.java
@@ -1,4 +1,4 @@
-public class PopCount {
+public class EliudsEggs {
     public int eggCount(int number) {
         throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
     }
diff --git a/exercises/practice/pop-count/src/test/java/PopCountTest.java b/exercises/practice/eliuds-eggs/src/test/java/EliudsEggsTest.java
similarity index 74%
rename from exercises/practice/pop-count/src/test/java/PopCountTest.java
rename to exercises/practice/eliuds-eggs/src/test/java/EliudsEggsTest.java
index 7c849a209..fb193ee32 100644
--- a/exercises/practice/pop-count/src/test/java/PopCountTest.java
+++ b/exercises/practice/eliuds-eggs/src/test/java/EliudsEggsTest.java
@@ -4,11 +4,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PopCountTest {
+public class EliudsEggsTest {
     @Test
     @DisplayName("0 eggs")
     public void test0Eggs() {
-        assertThat(new PopCount().eggCount(0))
+        assertThat(new EliudsEggs().eggCount(0))
                 .isEqualTo(0);
     }
 
@@ -16,7 +16,7 @@ public void test0Eggs() {
     @Test
     @DisplayName("1 egg")
     public void test1Egg() {
-        assertThat(new PopCount().eggCount(16))
+        assertThat(new EliudsEggs().eggCount(16))
                 .isEqualTo(1);
     }
 
@@ -24,7 +24,7 @@ public void test1Egg() {
     @Test
     @DisplayName("4 eggs")
     public void test4Eggs() {
-        assertThat(new PopCount().eggCount(89))
+        assertThat(new EliudsEggs().eggCount(89))
                 .isEqualTo(4);
     }
 
@@ -32,7 +32,7 @@ public void test4Eggs() {
     @Test
     @DisplayName("13 eggs")
     public void test13Eggs() {
-        assertThat(new PopCount().eggCount(2000000000))
+        assertThat(new EliudsEggs().eggCount(2000000000))
                 .isEqualTo(13);
     }
 }
diff --git a/exercises/settings.gradle b/exercises/settings.gradle
index 4691dd952..6ee23501a 100644
--- a/exercises/settings.gradle
+++ b/exercises/settings.gradle
@@ -102,7 +102,7 @@ include 'practice:perfect-numbers'
 include 'practice:phone-number'
 include 'practice:pig-latin'
 include 'practice:poker'
-include 'practice:pop-count'
+include 'practice:eliuds-eggs'
 include 'practice:pov'
 include 'practice:prime-factors'
 include 'practice:protein-translation'