From 16865dc36fcb96446f0c7ba0471bf222a8f220cd Mon Sep 17 00:00:00 2001
From: Hayodea Hakol <hayodea@protonmail.com>
Date: Sun, 14 Sep 2025 13:16:02 -0400
Subject: [PATCH] Rename these files and change ifdef guards

---
 smocore/include/marionette/body/body.h          | 17 -----------------
 smocore/include/marionette/bodyMap/body.h       | 17 +++++++++++++++++
 .../marionette/{body => bodyMap}/bodyMap.h      | 12 ++++++------
 .../marionette/{body => bodyMap}/bodyMessage.h  | 14 +++++++-------
 .../include/marionette/{body => bodyMap}/limb.h | 12 ++++++------
 .../include/marionette/{body => bodyMap}/map.h  | 12 ++++++------
 .../include/marionette/{body => bodyMap}/part.h | 10 +++++-----
 7 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 smocore/include/marionette/body/body.h
 create mode 100644 smocore/include/marionette/bodyMap/body.h
 rename smocore/include/marionette/{body => bodyMap}/bodyMap.h (54%)
 rename smocore/include/marionette/{body => bodyMap}/bodyMessage.h (81%)
 rename smocore/include/marionette/{body => bodyMap}/limb.h (75%)
 rename smocore/include/marionette/{body => bodyMap}/map.h (58%)
 rename smocore/include/marionette/{body => bodyMap}/part.h (86%)

diff --git a/smocore/include/marionette/body/body.h b/smocore/include/marionette/body/body.h
deleted file mode 100644
index aa2385a..0000000
--- a/smocore/include/marionette/body/body.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _BODY_H
-#define _BODY_H
-
-namespace mrntt {
-namespace body {
-
-class Body
-{
-public:
-    Body() = default;
-    ~Body() = default;
-};
-
-} // namespace body
-} // namespace mrntt
-
-#endif // _BODY_H
diff --git a/smocore/include/marionette/bodyMap/body.h b/smocore/include/marionette/bodyMap/body.h
new file mode 100644
index 0000000..aaa9252
--- /dev/null
+++ b/smocore/include/marionette/bodyMap/body.h
@@ -0,0 +1,17 @@
+#ifndef _MRNTT_BODYMAP_BODY_H
+#define _MRNTT_BODYMAP_BODY_H
+
+namespace mrntt {
+namespace bodyMap {
+
+class Body
+{
+public:
+    Body() = default;
+    ~Body() = default;
+};
+
+} // namespace bodyMap
+} // namespace mrntt
+
+#endif // _MRNTT_BODYMAP_BODY_H
diff --git a/smocore/include/marionette/body/bodyMap.h b/smocore/include/marionette/bodyMap/bodyMap.h
similarity index 54%
rename from smocore/include/marionette/body/bodyMap.h
rename to smocore/include/marionette/bodyMap/bodyMap.h
index af980c1..f81482e 100644
--- a/smocore/include/marionette/body/bodyMap.h
+++ b/smocore/include/marionette/bodyMap/bodyMap.h
@@ -1,12 +1,12 @@
-#ifndef MRNTT_BODY_BODYMAP_H
-#define MRNTT_BODY_BODYMAP_H
+#ifndef MRNTT_BODYMAP_BODYMAP_H
+#define MRNTT_BODYMAP_BODYMAP_H
 
 #include <set>
 #include <cstdint>
-#include <body/limb.h>
+#include <bodyMap/limb.h>
 
 namespace mrntt {
-namespace body {
+namespace bodyMap {
 
 class BodyMap {
 public:
@@ -17,7 +17,7 @@ public:
     std::set<uint32_t, Limb> limbs;
 };
 
-} // namespace body
+} // namespace bodyMap
 } // namespace mrntt
 
-#endif // MRNTT_BODY_BODYMAP_H
+#endif // MRNTT_BODYMAP_BODYMAP_H
diff --git a/smocore/include/marionette/body/bodyMessage.h b/smocore/include/marionette/bodyMap/bodyMessage.h
similarity index 81%
rename from smocore/include/marionette/body/bodyMessage.h
rename to smocore/include/marionette/bodyMap/bodyMessage.h
index 4ce8b30..e3a7e8e 100644
--- a/smocore/include/marionette/body/bodyMessage.h
+++ b/smocore/include/marionette/bodyMap/bodyMessage.h
@@ -1,14 +1,14 @@
-#ifndef MRNTT_BODY_BODYMESSAGE_H
-#define MRNTT_BODY_BODYMESSAGE_H
+#ifndef MRNTT_BODYMAP_BODYMESSAGE_H
+#define MRNTT_BODYMAP_BODYMESSAGE_H
 
 #include <vector>
 #include <cstdint>
 
-#include <body/limb.h>
-#include <body/part.h>
+#include <bodyMap/limb.h>
+#include <bodyMap/part.h>
 
 namespace mrntt {
-namespace body {
+namespace bodyMap {
 
 class BodyMessage
 {
@@ -60,7 +60,7 @@ public:
     const Part& part;
 };
 
-} // namespace body
+} // namespace bodyMap
 } // namespace mrntt
 
-#endif // MRNTT_BODY_BODYMESSAGE_H
\ No newline at end of file
+#endif // MRNTT_BODYMAP_BODYMESSAGE_H
\ No newline at end of file
diff --git a/smocore/include/marionette/body/limb.h b/smocore/include/marionette/bodyMap/limb.h
similarity index 75%
rename from smocore/include/marionette/body/limb.h
rename to smocore/include/marionette/bodyMap/limb.h
index 8223100..5031cea 100644
--- a/smocore/include/marionette/body/limb.h
+++ b/smocore/include/marionette/bodyMap/limb.h
@@ -1,14 +1,14 @@
-#ifndef MRNTT_BODY_LIMB_H
-#define MRNTT_BODY_LIMB_H
+#ifndef MRNTT_BODYMAP_LIMB_H
+#define MRNTT_BODYMAP_LIMB_H
 
 #include <string>
 #include <set>
 #include <cstdint>
 
-#include <body/part.h>
+#include <bodyMap/part.h>
 
 namespace mrntt {
-namespace body {
+namespace bodyMap {
 
 class Limb
 {
@@ -28,7 +28,7 @@ public:
     std::set<uint32_t, Part> parts;
 };
 
-} // namespace body
+} // namespace bodyMap
 } // namespace mrntt
 
-#endif // MRNTT_BODY_LIMB_H
+#endif // MRNTT_BODYMAP_LIMB_H
diff --git a/smocore/include/marionette/body/map.h b/smocore/include/marionette/bodyMap/map.h
similarity index 58%
rename from smocore/include/marionette/body/map.h
rename to smocore/include/marionette/bodyMap/map.h
index cb52eed..128494c 100644
--- a/smocore/include/marionette/body/map.h
+++ b/smocore/include/marionette/bodyMap/map.h
@@ -1,13 +1,13 @@
-#ifndef _BODY_MAP_H
-#define _BODY_MAP_H
+#ifndef _BODYMAP_MAP_H
+#define _BODYMAP_MAP_H
 
 #include <set>
 #include <cstdint>
 
-#include <body/limb.h>
+#include <bodyMap/limb.h>
 
 namespace mrntt {
-namespace body {
+namespace bodyMap {
 
 class BodyMap {
 public:
@@ -17,7 +17,7 @@ public:
     std::set<uint32_t, Limb> limbs;
 };
 
-} // namespace body
+} // namespace bodyMap
 } // namespace mrntt
 
-#endif // _BODY_MAP_H
+#endif // _BODYMAP_MAP_H
diff --git a/smocore/include/marionette/body/part.h b/smocore/include/marionette/bodyMap/part.h
similarity index 86%
rename from smocore/include/marionette/body/part.h
rename to smocore/include/marionette/bodyMap/part.h
index 22cc39b..a7e4b29 100644
--- a/smocore/include/marionette/body/part.h
+++ b/smocore/include/marionette/bodyMap/part.h
@@ -1,5 +1,5 @@
-#ifndef BODYPART_H
-#define BODYPART_H
+#ifndef BODYMAP_PART_H
+#define BODYMAP_PART_H
 
 #include <cstdint>
 #include <string>
@@ -8,7 +8,7 @@
 #include <sensors/interoceptor.h>
 
 namespace mrntt {
-namespace body {
+namespace bodyMap {
 
 class Spot
 {
@@ -42,7 +42,7 @@ public:
     std::set<uint32_t, Spot> spots;
 };
 
-} // namespace body
+} // namespace bodyMap
 } // namespace mrntt
 
-#endif // BODYPART_H
+#endif // BODYMAP_PART_H