diff --git a/exercises/practice/eliuds-eggs/.meta/config.json b/exercises/practice/eliuds-eggs/.meta/config.json
index ccb4de32..7e511f64 100644
--- a/exercises/practice/eliuds-eggs/.meta/config.json
+++ b/exercises/practice/eliuds-eggs/.meta/config.json
@@ -4,10 +4,10 @@
   ],
   "files": {
     "solution": [
-      "pop-count.tcl"
+      "eliuds-eggs.tcl"
     ],
     "test": [
-      "pop-count.test"
+      "eliuds-eggs.test"
     ],
     "example": [
       ".meta/example.tcl"
@@ -15,5 +15,5 @@
   },
   "blurb": "Help Eliud count the number of eggs in her chicken coop by counting the number of 1 bits in a binary representation.",
   "source": "Christian Willner, Eric Willigers",
-  "source_url": "https://forum.exercism.org/t/new-exercise-suggestion-pop-count/7632/5"
+  "source_url": "https://forum.exercism.org/t/new-exercise-suggestion-eliuds-eggs/7632/5"
 }
diff --git a/exercises/practice/eliuds-eggs/pop-count.tcl b/exercises/practice/eliuds-eggs/eliuds-eggs.tcl
similarity index 100%
rename from exercises/practice/eliuds-eggs/pop-count.tcl
rename to exercises/practice/eliuds-eggs/eliuds-eggs.tcl
diff --git a/exercises/practice/eliuds-eggs/pop-count.test b/exercises/practice/eliuds-eggs/eliuds-eggs.test
similarity index 61%
rename from exercises/practice/eliuds-eggs/pop-count.test
rename to exercises/practice/eliuds-eggs/eliuds-eggs.test
index 46756c96..d2be1efe 100644
--- a/exercises/practice/eliuds-eggs/pop-count.test
+++ b/exercises/practice/eliuds-eggs/eliuds-eggs.test
@@ -4,24 +4,24 @@ namespace import ::tcltest::*
 source testHelpers.tcl
 
 ############################################################
-source "pop-count.tcl"
+source "eliuds-eggs.tcl"
 
-test pop-count-1 "0 eggs" -body {
+test eliuds-eggs-1 "0 eggs" -body {
     eggCount 0
 } -returnCodes ok -result 0
 
-skip pop-count-2
-test pop-count-2 "1 egg" -body {
+skip eliuds-eggs-2
+test eliuds-eggs-2 "1 egg" -body {
     eggCount 16
 } -returnCodes ok -result 1
 
-skip pop-count-3
-test pop-count-3 "4 eggs" -body {
+skip eliuds-eggs-3
+test eliuds-eggs-3 "4 eggs" -body {
     eggCount 89
 } -returnCodes ok -result 4
 
-skip pop-count-4
-test pop-count-4 "13 eggs" -body {
+skip eliuds-eggs-4
+test eliuds-eggs-4 "13 eggs" -body {
     eggCount 2000000000
 } -returnCodes ok -result 13