diff --git a/3D/beepberry-cases/slide/README.md b/3D/beepy-cases/slide/README.md
similarity index 80%
rename from 3D/beepberry-cases/slide/README.md
rename to 3D/beepy-cases/slide/README.md
index fee8897b78ef02a4821c0c0260debcc3dba9d375..a0e90c4cefbfe2a9a82dbcd4d06e10780575b44b 100644
--- a/3D/beepberry-cases/slide/README.md
+++ b/3D/beepy-cases/slide/README.md
@@ -1,4 +1,4 @@
-# Simple slide cover for the Beepberry
+# Simple slide cover for the Beepy
 <img src=images/01.jpg width=200> <img src=images/02.jpg width=200>
 <img src=images/03.jpg width=200>
 
@@ -9,7 +9,7 @@ Minimal slide to cover the bare PCB and hold the battery. You can print multiple
 
 **Parts List**
 * Single printed part
-* A square of the packing foam from the beepberry box to cushion the battery, about the size of the battery
+* A square of the packing foam from the beepy box to cushion the battery, about the size of the battery
 
 **Instructions**
 * Sandwich the packing foam between the battery and PCB, make sure there are no kinks in the battery wires
diff --git a/3D/beepberry-cases/slide/beepberry-slide-v1.stl b/3D/beepy-cases/slide/beepy-slide-v1.stl
similarity index 100%
rename from 3D/beepberry-cases/slide/beepberry-slide-v1.stl
rename to 3D/beepy-cases/slide/beepy-slide-v1.stl
diff --git a/3D/beepberry-cases/slide/images/01.jpg b/3D/beepy-cases/slide/images/01.jpg
similarity index 100%
rename from 3D/beepberry-cases/slide/images/01.jpg
rename to 3D/beepy-cases/slide/images/01.jpg
diff --git a/3D/beepberry-cases/slide/images/02.jpg b/3D/beepy-cases/slide/images/02.jpg
similarity index 100%
rename from 3D/beepberry-cases/slide/images/02.jpg
rename to 3D/beepy-cases/slide/images/02.jpg
diff --git a/3D/beepberry-cases/slide/images/03.jpg b/3D/beepy-cases/slide/images/03.jpg
similarity index 100%
rename from 3D/beepberry-cases/slide/images/03.jpg
rename to 3D/beepy-cases/slide/images/03.jpg
diff --git a/3D/beepberry-cases/slim_flat/README.md b/3D/beepy-cases/slim_flat/README.md
similarity index 90%
rename from 3D/beepberry-cases/slim_flat/README.md
rename to 3D/beepy-cases/slim_flat/README.md
index beecd601f7d3135e20fa940c72d7bd552d141fdb..2f4284555ecf3d0e110b64e903178a9be30f698a 100644
--- a/3D/beepberry-cases/slim_flat/README.md
+++ b/3D/beepy-cases/slim_flat/README.md
@@ -1,4 +1,4 @@
-# Slim, flat, minimal case for the Beepberry
+# Slim, flat, minimal case for the Beepy
 <img src=images/01.jpg width=200> <img src=images/02.jpg width=200>  
 <img src=images/03.jpg width=200> <img src=images/04.jpg width=200>  
   
@@ -12,7 +12,7 @@ You can modify or export this design in different formats here: https://cad.onsh
 * Two printed parts
 * Two 6mm plastic screws - I used these: https://www.amazon.com/gp/product/B00GDYNJNM.  Maybe you can find silber buttonhead that match the m2.5 screws.
 * Four 6mm M2.5 scriws - I used the screws from this pack: https://www.amazon.com/gp/product/B01L06CUJG.
-* A square of the packing foam from the beepberry box to cushion the battery, about the size of the battery
+* A square of the packing foam from the Beepy box to cushion the battery, about the size of the battery
 
 **Instructions**
 * Print face down/back down. Supports are totally optional on the openings.  I had good luck with tree supports as they were easy to remove from delicate spots.
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev5 - Back.step b/3D/beepy-cases/slim_flat/Slim Case Rev5 - Back.step
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev5 - Back.step
rename to 3D/beepy-cases/slim_flat/Slim Case Rev5 - Back.step
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev5 - Back.stl b/3D/beepy-cases/slim_flat/Slim Case Rev5 - Back.stl
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev5 - Back.stl
rename to 3D/beepy-cases/slim_flat/Slim Case Rev5 - Back.stl
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev5 - Front.step b/3D/beepy-cases/slim_flat/Slim Case Rev5 - Front.step
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev5 - Front.step
rename to 3D/beepy-cases/slim_flat/Slim Case Rev5 - Front.step
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev5 - Front.stl b/3D/beepy-cases/slim_flat/Slim Case Rev5 - Front.stl
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev5 - Front.stl
rename to 3D/beepy-cases/slim_flat/Slim Case Rev5 - Front.stl
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev6 - Back.step b/3D/beepy-cases/slim_flat/Slim Case Rev6 - Back.step
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev6 - Back.step
rename to 3D/beepy-cases/slim_flat/Slim Case Rev6 - Back.step
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev6 - Back.stl b/3D/beepy-cases/slim_flat/Slim Case Rev6 - Back.stl
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev6 - Back.stl
rename to 3D/beepy-cases/slim_flat/Slim Case Rev6 - Back.stl
diff --git a/3D/beepberry-cases/slim_flat/Slim Case Rev7 - Back with SD Slot.stl b/3D/beepy-cases/slim_flat/Slim Case Rev7 - Back with SD Slot.stl
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/Slim Case Rev7 - Back with SD Slot.stl
rename to 3D/beepy-cases/slim_flat/Slim Case Rev7 - Back with SD Slot.stl
diff --git a/3D/beepberry-cases/slim_flat/images/01.jpg b/3D/beepy-cases/slim_flat/images/01.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/01.jpg
rename to 3D/beepy-cases/slim_flat/images/01.jpg
diff --git a/3D/beepberry-cases/slim_flat/images/02.jpg b/3D/beepy-cases/slim_flat/images/02.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/02.jpg
rename to 3D/beepy-cases/slim_flat/images/02.jpg
diff --git a/3D/beepberry-cases/slim_flat/images/03.jpg b/3D/beepy-cases/slim_flat/images/03.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/03.jpg
rename to 3D/beepy-cases/slim_flat/images/03.jpg
diff --git a/3D/beepberry-cases/slim_flat/images/04.jpg b/3D/beepy-cases/slim_flat/images/04.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/04.jpg
rename to 3D/beepy-cases/slim_flat/images/04.jpg
diff --git a/3D/beepberry-cases/slim_flat/images/05.jpg b/3D/beepy-cases/slim_flat/images/05.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/05.jpg
rename to 3D/beepy-cases/slim_flat/images/05.jpg
diff --git a/3D/beepberry-cases/slim_flat/images/06.jpg b/3D/beepy-cases/slim_flat/images/06.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/06.jpg
rename to 3D/beepy-cases/slim_flat/images/06.jpg
diff --git a/3D/beepberry-cases/slim_flat/images/07.jpg b/3D/beepy-cases/slim_flat/images/07.jpg
similarity index 100%
rename from 3D/beepberry-cases/slim_flat/images/07.jpg
rename to 3D/beepy-cases/slim_flat/images/07.jpg
diff --git a/3D/beepberry-cases/v1/beepberry-case-back.stl b/3D/beepy-cases/v1/beepy-case-back.stl
similarity index 100%
rename from 3D/beepberry-cases/v1/beepberry-case-back.stl
rename to 3D/beepy-cases/v1/beepy-case-back.stl
diff --git a/3D/beepberry-cases/v1/beepberry-case-button.stl b/3D/beepy-cases/v1/beepy-case-button.stl
similarity index 100%
rename from 3D/beepberry-cases/v1/beepberry-case-button.stl
rename to 3D/beepy-cases/v1/beepy-case-button.stl
diff --git a/3D/beepberry-cases/v1/beepberry-case-front.stl b/3D/beepy-cases/v1/beepy-case-front.stl
similarity index 100%
rename from 3D/beepberry-cases/v1/beepberry-case-front.stl
rename to 3D/beepy-cases/v1/beepy-case-front.stl
diff --git a/3D/beepberry-cases/v1/beepberry-case-v1.step b/3D/beepy-cases/v1/beepy-case-v1.step
similarity index 98%
rename from 3D/beepberry-cases/v1/beepberry-case-v1.step
rename to 3D/beepy-cases/v1/beepy-case-v1.step
index 24a475c80eb31e3ffb82ca44145e100d1dbaaf83..ff853cc0c80fee907063cddc44da92d6f3ef76b4 100644
--- a/3D/beepberry-cases/v1/beepberry-case-v1.step
+++ b/3D/beepy-cases/v1/beepy-case-v1.step
@@ -5,11 +5,11 @@ HEADER;
  */
 
 FILE_DESCRIPTION(
-/* description */ ('beepberry-case-v1'),
+/* description */ ('beepy-case-v1'),
 /* implementation_level */ '2;1');
 
 FILE_NAME(
-/* name */ 'beepberry-case-v1.step',
+/* name */ 'beepy-case-v1.step',
 /* author */ ('SQFMI'),
 /* organization */ ('SQFMI'),
 /* preprocessor_version */ 'ST-DEVELOPER v19.2',
diff --git a/3D/beepberry-device/beepberry-v1.step b/3D/beepy-device/beepy-v1.step
similarity index 97%
rename from 3D/beepberry-device/beepberry-v1.step
rename to 3D/beepy-device/beepy-v1.step
index 1593c93c13809720e1830bbdf062beff25a6bea4..0ae3d8d4112caaf940724ca8dcbdc4bb96bdd3a6 100644
--- a/3D/beepberry-device/beepberry-v1.step
+++ b/3D/beepy-device/beepy-v1.step
@@ -5,11 +5,11 @@ HEADER;
  */
 
 FILE_DESCRIPTION(
-/* description */ ('Beepberry v1'),
+/* description */ ('Beepy v1'),
 /* implementation_level */ '2;1');
 
 FILE_NAME(
-/* name */ 'beepberry-v1.step',
+/* name */ 'beepy-v1.step',
 /* time_stamp */ '2023-05-20T14:28:25-04:00',
 /* author */ ('SQFMI'),
 /* organization */ ('SQFMI'),