diff --git a/Sources/OpenGraphCxx/Attribute/AttributeType.cpp b/Sources/OpenGraphCxx/Attribute/AttributeType.cpp
index c66428ce..bd808761 100644
--- a/Sources/OpenGraphCxx/Attribute/AttributeType.cpp
+++ b/Sources/OpenGraphCxx/Attribute/AttributeType.cpp
@@ -5,4 +5,4 @@
 //  Created by Kyle on 2024/2/17.
 //
 
-#include <OpenGraphC/OGAttributeType.h>
+#include <OpenGraph/OGAttributeType.h>
diff --git a/Sources/OpenGraphCxx/Attribute/OGAttribute.cpp b/Sources/OpenGraphCxx/Attribute/OGAttribute.cpp
index 4f307832..64103d79 100644
--- a/Sources/OpenGraphCxx/Attribute/OGAttribute.cpp
+++ b/Sources/OpenGraphCxx/Attribute/OGAttribute.cpp
@@ -5,7 +5,7 @@
 //  Created by Kyle on 2024/2/16.
 //
 
-#include <OpenGraphC/OGAttribute.h>
+#include <OpenGraph/OGAttribute.h>
 #include <OpenGraphCxx/Attribute/AttributeID.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 #include <optional>
diff --git a/Sources/OpenGraphCxx/Attribute/OGWeakAttribute.cpp b/Sources/OpenGraphCxx/Attribute/OGWeakAttribute.cpp
index faad5166..403b6260 100644
--- a/Sources/OpenGraphCxx/Attribute/OGWeakAttribute.cpp
+++ b/Sources/OpenGraphCxx/Attribute/OGWeakAttribute.cpp
@@ -5,7 +5,7 @@
 //  Created by Kyle on 2024/2/27.
 //
 
-#include <OpenGraphC/OGWeakAttribute.h>
+#include <OpenGraph/OGWeakAttribute.h>
 
 OGWeakAttribute OGCreateWeakAttribute(OGAttribute attribute) {
     // TODO
diff --git a/Sources/OpenGraphCxx/Comparison/OGComparison.cpp b/Sources/OpenGraphCxx/Comparison/OGComparison.cpp
index a284e759..915f590e 100644
--- a/Sources/OpenGraphCxx/Comparison/OGComparison.cpp
+++ b/Sources/OpenGraphCxx/Comparison/OGComparison.cpp
@@ -2,7 +2,7 @@
 //  OGCompareValues.cpp
 //  OpenGraphCxx
 
-#include <OpenGraphC/OGComparison.h>
+#include <OpenGraph/OGComparison.h>
 #include <OpenGraphCxx/Comparison/OGComparisonPrivate.h>
 
 const void *OGComparisonStateGetDestination(OGComparisonState state) {
diff --git a/Sources/OpenGraphCxx/Data/OGUniqueID.c b/Sources/OpenGraphCxx/Data/OGUniqueID.c
index 0657681c..67cc2fe3 100644
--- a/Sources/OpenGraphCxx/Data/OGUniqueID.c
+++ b/Sources/OpenGraphCxx/Data/OGUniqueID.c
@@ -5,7 +5,7 @@
 //  Audited for iOS 18.0
 //  Status: Complete
 
-#include <OpenGraphC/OGUniqueID.h>
+#include <OpenGraph/OGUniqueID.h>
 #include <stdatomic.h>
 
 OGUniqueID OGMakeUniqueID(void) {
diff --git a/Sources/OpenGraphCxx/DebugServer/OGDebugServer.cpp b/Sources/OpenGraphCxx/DebugServer/OGDebugServer.cpp
index 407c0f7c..af2e71d7 100644
--- a/Sources/OpenGraphCxx/DebugServer/OGDebugServer.cpp
+++ b/Sources/OpenGraphCxx/DebugServer/OGDebugServer.cpp
@@ -5,7 +5,7 @@
 //  Created by Kyle on 2024/2/17.
 //
 
-#include <OpenGraphC/OGDebugServer.h>
+#include <OpenGraph/OGDebugServer.h>
 #include <OpenGraphCxx/DebugServer/og-debug-server.hpp>
 
 #if OG_TARGET_OS_DARWIN
diff --git a/Sources/OpenGraphCxx/DebugServer/og-debug-server.mm b/Sources/OpenGraphCxx/DebugServer/og-debug-server.mm
index 7f301d13..03934eb5 100644
--- a/Sources/OpenGraphCxx/DebugServer/og-debug-server.mm
+++ b/Sources/OpenGraphCxx/DebugServer/og-debug-server.mm
@@ -8,7 +8,7 @@
 #include <OpenGraphCxx/DebugServer/og-debug-server.hpp>
 #if OG_TARGET_OS_DARWIN
 
-#include <OpenGraphC/OGGraphDescription.h>
+#include <OpenGraph/OGGraphDescription.h>
 #include <OpenGraphCxx/Util/log.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 #include <OpenGraphCxx/Graph/Graph.hpp>
diff --git a/Sources/OpenGraphCxx/Graph/Graph.cpp b/Sources/OpenGraphCxx/Graph/Graph.cpp
index 36d40f6a..10619c77 100644
--- a/Sources/OpenGraphCxx/Graph/Graph.cpp
+++ b/Sources/OpenGraphCxx/Graph/Graph.cpp
@@ -4,7 +4,7 @@
 
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraphCxx/Graph/Subgraph.hpp>
-#include <OpenGraphC/OGGraphDescription.h>
+#include <OpenGraph/OGGraphDescription.h>
 
 #if !OG_TARGET_OS_WASI
 #include <dispatch/dispatch.h>
diff --git a/Sources/OpenGraphCxx/Graph/Graph.mm b/Sources/OpenGraphCxx/Graph/Graph.mm
index 06c6e887..476ad160 100644
--- a/Sources/OpenGraphCxx/Graph/Graph.mm
+++ b/Sources/OpenGraphCxx/Graph/Graph.mm
@@ -3,7 +3,7 @@
 //  OpenGraphCxx
 
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphC/OGGraphDescription.h>
+#include <OpenGraph/OGGraphDescription.h>
 
 #if OG_OBJC_FOUNDATION
 #include <Foundation/Foundation.h>
diff --git a/Sources/OpenGraphCxx/Graph/GraphContext.cpp b/Sources/OpenGraphCxx/Graph/GraphContext.cpp
index cf21346a..a2a191cb 100644
--- a/Sources/OpenGraphCxx/Graph/GraphContext.cpp
+++ b/Sources/OpenGraphCxx/Graph/GraphContext.cpp
@@ -6,7 +6,7 @@
 //
 
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Util/assert.hpp>
 
 OG::Graph::Context &OG::Graph::Context::from_cf(OGGraphRef storage) OG_NOEXCEPT {
diff --git a/Sources/OpenGraphCxx/Graph/GraphDescription.cpp b/Sources/OpenGraphCxx/Graph/GraphDescription.cpp
index 44139547..0634613b 100644
--- a/Sources/OpenGraphCxx/Graph/GraphDescription.cpp
+++ b/Sources/OpenGraphCxx/Graph/GraphDescription.cpp
@@ -2,8 +2,8 @@
 //  GraphDescription.cpp
 //  OpenGraphCxx
 
-#include <OpenGraphC/OGGraphDescription.h>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGGraphDescription.h>
+#include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 
diff --git a/Sources/OpenGraphCxx/Graph/GraphDescription.mm b/Sources/OpenGraphCxx/Graph/GraphDescription.mm
index e9773085..ae83cef5 100644
--- a/Sources/OpenGraphCxx/Graph/GraphDescription.mm
+++ b/Sources/OpenGraphCxx/Graph/GraphDescription.mm
@@ -2,8 +2,8 @@
 //  GraphDescription.mm
 //  OpenGraphCxx
 
-#include <OpenGraphC/OGGraphDescription.h>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGGraphDescription.h>
+#include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 
diff --git a/Sources/OpenGraphCxx/Graph/OGGraph.cpp b/Sources/OpenGraphCxx/Graph/OGGraph.cpp
index c0087070..b2d6de1e 100644
--- a/Sources/OpenGraphCxx/Graph/OGGraph.cpp
+++ b/Sources/OpenGraphCxx/Graph/OGGraph.cpp
@@ -5,7 +5,7 @@
 //  Created by Kyle on 2024/2/15.
 //
 
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 #include <OpenGraphCxx/Data/ClosureFunction.hpp>
diff --git a/Sources/OpenGraphCxx/Graph/OGGraphContext.cpp b/Sources/OpenGraphCxx/Graph/OGGraphContext.cpp
index b876c752..6fc9245a 100644
--- a/Sources/OpenGraphCxx/Graph/OGGraphContext.cpp
+++ b/Sources/OpenGraphCxx/Graph/OGGraphContext.cpp
@@ -5,8 +5,8 @@
 //  Created by Kyle on 2024/2/16.
 //
 
-#include <OpenGraphC/OGGraphContext.h>
-#include <OpenGraphC/Private/CFRuntime.h>
+#include <OpenGraph/OGGraphContext.h>
+#include <OpenGraph/Private/CFRuntime.h>
 
 OGGraphRef OGGraphContextGetGraph(OGGraphContextRef context) {
     return reinterpret_cast<OGGraphRef>(reinterpret_cast<uintptr_t>(context) - sizeof(CFRuntimeBase));
diff --git a/Sources/OpenGraphCxx/Graph/OGGraphTracing.cpp b/Sources/OpenGraphCxx/Graph/OGGraphTracing.cpp
index f6071f3f..d3a8da4e 100644
--- a/Sources/OpenGraphCxx/Graph/OGGraphTracing.cpp
+++ b/Sources/OpenGraphCxx/Graph/OGGraphTracing.cpp
@@ -2,7 +2,7 @@
 //  OGGraphTracing.mm
 //  OpenGraphCxx
 
-#include <OpenGraphC/OGGraphTracing.h>
+#include <OpenGraph/OGGraphTracing.h>
 
 void OGGraphStartTracing(_Nullable OGGraphRef graph, OGGraphTraceFlags options) {
     OGGraphStartTracing2(graph, options, NULL);
diff --git a/Sources/OpenGraphCxx/Graph/OGSubgraph.cpp b/Sources/OpenGraphCxx/Graph/OGSubgraph.cpp
index daad1a88..898fb80c 100644
--- a/Sources/OpenGraphCxx/Graph/OGSubgraph.cpp
+++ b/Sources/OpenGraphCxx/Graph/OGSubgraph.cpp
@@ -5,10 +5,10 @@
 //  Created by Kyle on 2024/2/15.
 //
 
-#include <OpenGraphC/OGSubgraph.h>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGSubgraph.h>
+#include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Subgraph.hpp>
-#include <OpenGraphC/OGGraphContext.h>
+#include <OpenGraph/OGGraphContext.h>
 #include <OpenGraphCxx/Util/assert.hpp>
 #include <OpenGraphCxx/Util/env.hpp>
 #include <pthread.h>
diff --git a/Sources/OpenGraphCxx/Graph/Subgraph.cpp b/Sources/OpenGraphCxx/Graph/Subgraph.cpp
index 82ad4dc1..015615a4 100644
--- a/Sources/OpenGraphCxx/Graph/Subgraph.cpp
+++ b/Sources/OpenGraphCxx/Graph/Subgraph.cpp
@@ -6,7 +6,7 @@
 //
 
 #include <OpenGraphCxx/Graph/Subgraph.hpp>
-#include <OpenGraphC/OGSubgraph.h>
+#include <OpenGraph/OGSubgraph.h>
 
 pthread_key_t OG::Subgraph::_current_subgraph_key;
 
diff --git a/Sources/OpenGraphCxx/Runtime/OGTupleType.cpp b/Sources/OpenGraphCxx/Runtime/OGTupleType.cpp
index 23b4dd1e..4422651f 100644
--- a/Sources/OpenGraphCxx/Runtime/OGTupleType.cpp
+++ b/Sources/OpenGraphCxx/Runtime/OGTupleType.cpp
@@ -5,7 +5,7 @@
 //  Audited for iOS 18.0
 //  Status: Complete
 
-#include <OpenGraphC/OGTupleType.h>
+#include <OpenGraph/OGTupleType.h>
 #include <OpenGraphCxx/Runtime/metadata.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 
diff --git a/Sources/OpenGraphCxx/Runtime/OGTypeID.cpp b/Sources/OpenGraphCxx/Runtime/OGTypeID.cpp
index 3d4873eb..0974231a 100644
--- a/Sources/OpenGraphCxx/Runtime/OGTypeID.cpp
+++ b/Sources/OpenGraphCxx/Runtime/OGTypeID.cpp
@@ -5,7 +5,7 @@
 //  Audited for iOS 18.0
 //  Status: WIP
 
-#include <OpenGraphC/OGTypeID.h>
+#include <OpenGraph/OGTypeID.h>
 #include <OpenGraphCxx/Runtime/metadata.hpp>
 #include <OpenGraphCxx/Util/assert.hpp>
 
diff --git a/Sources/OpenGraphCxx/Version/OGVersion.c b/Sources/OpenGraphCxx/Version/OGVersion.c
index 00e51f39..f49ff4c8 100644
--- a/Sources/OpenGraphCxx/Version/OGVersion.c
+++ b/Sources/OpenGraphCxx/Version/OGVersion.c
@@ -2,8 +2,8 @@
 //  OGVersion.c
 //  OpenGraph
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGVersion.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGVersion.h>
 
 #if OPENGRAPH_RELEASE == OPENGRAPH_RELEASE_2024
 const double OpenGraphVersionNumber __attribute__ ((used)) = (double)6.0;
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttribute.h b/Sources/OpenGraphCxx/include/OpenGraph/OGAttribute.h
similarity index 93%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGAttribute.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGAttribute.h
index b3e0225a..6cc6d051 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttribute.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGAttribute.h
@@ -5,16 +5,16 @@
 #ifndef OGAttribute_h
 #define OGAttribute_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGAttributeInfo.h>
-#include <OpenGraphC/OGAttributeFlags.h>
-#include <OpenGraphC/OGCachedValueOptions.h>
-#include <OpenGraphC/OGGraph.h>
-#include <OpenGraphC/OGInputOptions.h>
-#include <OpenGraphC/OGTypeID.h>
-#include <OpenGraphC/OGValue.h>
-#include <OpenGraphC/OGValueOptions.h>
-#include <OpenGraphC/OGValueState.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGAttributeInfo.h>
+#include <OpenGraph/OGAttributeFlags.h>
+#include <OpenGraph/OGCachedValueOptions.h>
+#include <OpenGraph/OGGraph.h>
+#include <OpenGraph/OGInputOptions.h>
+#include <OpenGraph/OGTypeID.h>
+#include <OpenGraph/OGValue.h>
+#include <OpenGraph/OGValueOptions.h>
+#include <OpenGraph/OGValueState.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeFlags.h b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeFlags.h
similarity index 93%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeFlags.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGAttributeFlags.h
index 8f3958b3..960bf5f1 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeFlags.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeFlags.h
@@ -8,7 +8,7 @@
 #ifndef OGAttributeFlags_h
 #define OGAttributeFlags_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGAttributeFlags) {
     OGAttributeFlagsDefault = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeInfo.h b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeInfo.h
similarity index 81%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeInfo.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGAttributeInfo.h
index 2bc54f07..fda95fc5 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeInfo.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeInfo.h
@@ -8,8 +8,8 @@
 #ifndef OGAttributeInfo_h
 #define OGAttributeInfo_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGAttributeType.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGAttributeType.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeType.h b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeType.h
similarity index 81%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeType.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGAttributeType.h
index e255b976..67aa2a0b 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeType.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeType.h
@@ -5,8 +5,8 @@
 #ifndef OGAttributeType_h
 #define OGAttributeType_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGTypeID.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGTypeID.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeTypeFlags.h b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeTypeFlags.h
similarity index 93%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeTypeFlags.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGAttributeTypeFlags.h
index 912d2351..a6b02c6b 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGAttributeTypeFlags.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGAttributeTypeFlags.h
@@ -5,7 +5,7 @@
 #ifndef OGAttributeTypeFlags_h
 #define OGAttributeTypeFlags_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGAttributeTypeFlags) {
     OGAttributeTypeFlagsDefault = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGBase.h b/Sources/OpenGraphCxx/include/OpenGraph/OGBase.h
similarity index 100%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGBase.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGBase.h
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGCachedValueOptions.h b/Sources/OpenGraphCxx/include/OpenGraph/OGCachedValueOptions.h
similarity index 93%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGCachedValueOptions.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGCachedValueOptions.h
index f5185f31..fbf89a78 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGCachedValueOptions.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGCachedValueOptions.h
@@ -5,7 +5,7 @@
 #ifndef OGCachedValueOptions_h
 #define OGCachedValueOptions_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGCachedValueOptions) {
     OGCachedValueOptions_0 = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGChangedValueFlags.h b/Sources/OpenGraphCxx/include/OpenGraph/OGChangedValueFlags.h
similarity index 90%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGChangedValueFlags.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGChangedValueFlags.h
index a6b8d7dc..e76b5efb 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGChangedValueFlags.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGChangedValueFlags.h
@@ -5,7 +5,7 @@
 #ifndef OGChangedValueFlags_h
 #define OGChangedValueFlags_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGChangedValueFlags) {
     OGChangedValueFlags_1 = 1 << 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGComparison.h b/Sources/OpenGraphCxx/include/OpenGraph/OGComparison.h
similarity index 98%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGComparison.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGComparison.h
index 83b7b8b5..2f456478 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGComparison.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGComparison.h
@@ -30,8 +30,8 @@
 #ifndef OGComparison_h
 #define OGComparison_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGTypeID.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGTypeID.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGCounterQueryType.h b/Sources/OpenGraphCxx/include/OpenGraph/OGCounterQueryType.h
similarity index 93%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGCounterQueryType.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGCounterQueryType.h
index 96e65295..36e925ff 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGCounterQueryType.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGCounterQueryType.h
@@ -5,7 +5,7 @@
 #ifndef OGCounterQueryType_h
 #define OGCounterQueryType_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_ENUM(uint32_t, OGCounterQueryType) {
     OGCounterQueryType_0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGDebugServer.h b/Sources/OpenGraphCxx/include/OpenGraph/OGDebugServer.h
similarity index 96%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGDebugServer.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGDebugServer.h
index 327295ea..d44eae79 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGDebugServer.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGDebugServer.h
@@ -5,7 +5,7 @@
 #ifndef OGDebugServer_h
 #define OGDebugServer_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 #if OG_TARGET_OS_DARWIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraph.h b/Sources/OpenGraphCxx/include/OpenGraph/OGGraph.h
similarity index 96%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGGraph.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGGraph.h
index f61896ca..811490c9 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraph.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGGraph.h
@@ -5,9 +5,9 @@
 #ifndef OGGraph_h
 #define OGGraph_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/Private/CFRuntime.h>
-#include <OpenGraphC/OGCounterQueryType.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/Private/CFRuntime.h>
+#include <OpenGraph/OGCounterQueryType.h>
 
 // Note: Place all structure declaration in a single place to avoid header cycle dependency
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraphContext.h b/Sources/OpenGraphCxx/include/OpenGraph/OGGraphContext.h
similarity index 87%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGGraphContext.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGGraphContext.h
index 19cf064a..6eae3975 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraphContext.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGGraphContext.h
@@ -5,8 +5,8 @@
 #ifndef OGGraphContext_h
 #define OGGraphContext_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGGraph.h>
 
 // MARK: - Exported C functions
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraphDescription.h b/Sources/OpenGraphCxx/include/OpenGraph/OGGraphDescription.h
similarity index 95%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGGraphDescription.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGGraphDescription.h
index fd74e5e3..c57883c9 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraphDescription.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGGraphDescription.h
@@ -5,8 +5,8 @@
 #ifndef OGGraphDescription_h
 #define OGGraphDescription_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGGraph.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraphTracing.h b/Sources/OpenGraphCxx/include/OpenGraph/OGGraphTracing.h
similarity index 93%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGGraphTracing.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGGraphTracing.h
index fc4c5633..cbea1c0e 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGGraphTracing.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGGraphTracing.h
@@ -5,8 +5,8 @@
 #ifndef OGGraphTracing_hpp
 #define OGGraphTracing_hpp
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGGraph.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGGraph.h>
 
 typedef OG_OPTIONS(uint32_t, OGGraphTraceFlags) {
     OGGraphTraceFlags_0 = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGInputOptions.h b/Sources/OpenGraphCxx/include/OpenGraph/OGInputOptions.h
similarity index 87%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGInputOptions.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGInputOptions.h
index a49881a3..4ef76eb7 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGInputOptions.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGInputOptions.h
@@ -5,7 +5,7 @@
 #ifndef OGInputOptions_h
 #define OGInputOptions_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGInputOptions) {
     OGInputOptions_0 = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGSearchOptions.h b/Sources/OpenGraphCxx/include/OpenGraph/OGSearchOptions.h
similarity index 87%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGSearchOptions.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGSearchOptions.h
index aba0e1b9..2b53e269 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGSearchOptions.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGSearchOptions.h
@@ -5,7 +5,7 @@
 #ifndef OGSearchOptions_h
 #define OGSearchOptions_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGSearchOptions) {
     OGSearchOptions_0 = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGSubgraph.h b/Sources/OpenGraphCxx/include/OpenGraph/OGSubgraph.h
similarity index 94%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGSubgraph.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGSubgraph.h
index 6fb5b444..c08fadc8 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGSubgraph.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGSubgraph.h
@@ -5,12 +5,12 @@
 #ifndef OGSubgraph_h
 #define OGSubgraph_h
 
-#include <OpenGraphC/OGAttribute.h>
-#include <OpenGraphC/OGAttributeFlags.h>
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGGraph.h>
-#include <OpenGraphC/OGUniqueID.h>
-#include <OpenGraphC/Private/CFRuntime.h>
+#include <OpenGraph/OGAttribute.h>
+#include <OpenGraph/OGAttributeFlags.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGGraph.h>
+#include <OpenGraph/OGUniqueID.h>
+#include <OpenGraph/Private/CFRuntime.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGSwiftSupport.h b/Sources/OpenGraphCxx/include/OpenGraph/OGSwiftSupport.h
similarity index 100%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGSwiftSupport.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGSwiftSupport.h
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGTargetConditionals.h b/Sources/OpenGraphCxx/include/OpenGraph/OGTargetConditionals.h
similarity index 100%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGTargetConditionals.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGTargetConditionals.h
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGTupleType.h b/Sources/OpenGraphCxx/include/OpenGraph/OGTupleType.h
similarity index 97%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGTupleType.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGTupleType.h
index 460ec901..f58a0dba 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGTupleType.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGTupleType.h
@@ -8,8 +8,8 @@
 #ifndef OGTupleType_h
 #define OGTupleType_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGTypeID.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGTypeID.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGTypeID.h b/Sources/OpenGraphCxx/include/OpenGraph/OGTypeID.h
similarity index 97%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGTypeID.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGTypeID.h
index 8ed9b4a6..4b7109fa 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGTypeID.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGTypeID.h
@@ -8,8 +8,8 @@
 #ifndef OGTypeID_h
 #define OGTypeID_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGVersion.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGVersion.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGUniqueID.h b/Sources/OpenGraphCxx/include/OpenGraph/OGUniqueID.h
similarity index 91%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGUniqueID.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGUniqueID.h
index 220a4267..bec0f32b 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGUniqueID.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGUniqueID.h
@@ -8,7 +8,7 @@
 #ifndef OGMakeUniqueID_h
 #define OGMakeUniqueID_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 typedef long OGUniqueID;
 
 OG_EXTERN_C_BEGIN
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGValue.h b/Sources/OpenGraphCxx/include/OpenGraph/OGValue.h
similarity index 88%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGValue.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGValue.h
index f83a5226..5c1ff9ad 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGValue.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGValue.h
@@ -5,7 +5,7 @@
 #ifndef OGValue_h
 #define OGValue_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGValueOptions.h b/Sources/OpenGraphCxx/include/OpenGraph/OGValueOptions.h
similarity index 89%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGValueOptions.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGValueOptions.h
index a12d9080..981f8bbf 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGValueOptions.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGValueOptions.h
@@ -5,7 +5,7 @@
 #ifndef OGValueOptions_h
 #define OGValueOptions_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 typedef OG_OPTIONS(uint32_t, OGValueOptions) {
     OGValueOptions_0 = 0,
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGValueState.h b/Sources/OpenGraphCxx/include/OpenGraph/OGValueState.h
similarity index 87%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGValueState.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGValueState.h
index 2a5ba371..aecad3eb 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGValueState.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGValueState.h
@@ -5,7 +5,7 @@
 #ifndef OGValueState_h
 #define OGValueState_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGVersion.h b/Sources/OpenGraphCxx/include/OpenGraph/OGVersion.h
similarity index 91%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGVersion.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGVersion.h
index 5fd7c6f2..d72cf048 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGVersion.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGVersion.h
@@ -5,7 +5,7 @@
 #ifndef OGVersion_h
 #define OGVersion_h
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 #define OPENGRAPH_RELEASE_2021 2021
 #define OPENGRAPH_RELEASE_2024 2024
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OGWeakAttribute.h b/Sources/OpenGraphCxx/include/OpenGraph/OGWeakAttribute.h
similarity index 90%
rename from Sources/OpenGraphCxx/include/OpenGraphC/OGWeakAttribute.h
rename to Sources/OpenGraphCxx/include/OpenGraph/OGWeakAttribute.h
index ada838fc..db7791e1 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OGWeakAttribute.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OGWeakAttribute.h
@@ -5,8 +5,8 @@
 #ifndef OGWeakAttribute_hpp
 #define OGWeakAttribute_hpp
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGAttribute.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGAttribute.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraph/OpenGraph-umbrella.h b/Sources/OpenGraphCxx/include/OpenGraph/OpenGraph-umbrella.h
new file mode 100644
index 00000000..f9016cc3
--- /dev/null
+++ b/Sources/OpenGraphCxx/include/OpenGraph/OpenGraph-umbrella.h
@@ -0,0 +1,29 @@
+#include <OpenGraph/OGAttribute.h>
+#include <OpenGraph/OGAttributeFlags.h>
+#include <OpenGraph/OGAttributeInfo.h>
+#include <OpenGraph/OGAttributeType.h>
+#include <OpenGraph/OGAttributeTypeFlags.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGCachedValueOptions.h>
+#include <OpenGraph/OGChangedValueFlags.h>
+#include <OpenGraph/OGComparison.h>
+#include <OpenGraph/OGCounterQueryType.h>
+#include <OpenGraph/OGDebugServer.h>
+#include <OpenGraph/OGGraph.h>
+#include <OpenGraph/OGGraphContext.h>
+#include <OpenGraph/OGGraphDescription.h>
+#include <OpenGraph/OGGraphTracing.h>
+#include <OpenGraph/OGInputOptions.h>
+#include <OpenGraph/OGSearchOptions.h>
+#include <OpenGraph/OGSubgraph.h>
+#include <OpenGraph/OGTupleType.h>
+#include <OpenGraph/OGTypeID.h>
+#include <OpenGraph/OGUniqueID.h>
+#include <OpenGraph/OGValue.h>
+#include <OpenGraph/OGValueOptions.h>
+#include <OpenGraph/OGValueState.h>
+#include <OpenGraph/OGVersion.h>
+#include <OpenGraph/OGWeakAttribute.h>
+
+OG_EXPORT double OpenGraphVersionNumber;
+OG_EXPORT const unsigned char OpenGraphVersionString[];
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/Private/CFRuntime.h b/Sources/OpenGraphCxx/include/OpenGraph/Private/CFRuntime.h
similarity index 99%
rename from Sources/OpenGraphCxx/include/OpenGraphC/Private/CFRuntime.h
rename to Sources/OpenGraphCxx/include/OpenGraph/Private/CFRuntime.h
index b9565aa0..862c13fd 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphC/Private/CFRuntime.h
+++ b/Sources/OpenGraphCxx/include/OpenGraph/Private/CFRuntime.h
@@ -1,4 +1,4 @@
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #if OG_TARGET_OS_DARWIN
 // Copied from https://github.com/apple/swift-corelibs-foundation/blob/d8e8a8b92b3a8af8381a11155328c1bba1c6bd2c/CoreFoundation/Base.subproj/CFRuntime.h
 /*	CFRuntime.h
diff --git a/Sources/OpenGraphCxx/include/OpenGraphC/OpenGraph-umbrella.h b/Sources/OpenGraphCxx/include/OpenGraphC/OpenGraph-umbrella.h
deleted file mode 100644
index a434825f..00000000
--- a/Sources/OpenGraphCxx/include/OpenGraphC/OpenGraph-umbrella.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <OpenGraphC/OGAttribute.h>
-#include <OpenGraphC/OGAttributeFlags.h>
-#include <OpenGraphC/OGAttributeInfo.h>
-#include <OpenGraphC/OGAttributeType.h>
-#include <OpenGraphC/OGAttributeTypeFlags.h>
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGCachedValueOptions.h>
-#include <OpenGraphC/OGChangedValueFlags.h>
-#include <OpenGraphC/OGComparison.h>
-#include <OpenGraphC/OGCounterQueryType.h>
-#include <OpenGraphC/OGDebugServer.h>
-#include <OpenGraphC/OGGraph.h>
-#include <OpenGraphC/OGGraphContext.h>
-#include <OpenGraphC/OGGraphDescription.h>
-#include <OpenGraphC/OGGraphTracing.h>
-#include <OpenGraphC/OGInputOptions.h>
-#include <OpenGraphC/OGSearchOptions.h>
-#include <OpenGraphC/OGSubgraph.h>
-#include <OpenGraphC/OGTupleType.h>
-#include <OpenGraphC/OGTypeID.h>
-#include <OpenGraphC/OGUniqueID.h>
-#include <OpenGraphC/OGValue.h>
-#include <OpenGraphC/OGValueOptions.h>
-#include <OpenGraphC/OGValueState.h>
-#include <OpenGraphC/OGVersion.h>
-#include <OpenGraphC/OGWeakAttribute.h>
-
-OG_EXPORT double OpenGraphVersionNumber;
-OG_EXPORT const unsigned char OpenGraphVersionString[];
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeID.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeID.hpp
index 09bb09e9..29e83e07 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeID.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeID.hpp
@@ -8,8 +8,8 @@
 #ifndef AttributeID_hpp
 #define AttributeID_hpp
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGAttribute.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGAttribute.h>
 #include <OpenGraphCxx/Util/assert.hpp>
 
 namespace OG {
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeType.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeType.hpp
index 05c8e494..9754bd2a 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeType.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeType.hpp
@@ -5,8 +5,8 @@
 #ifndef AttributeType_hpp
 #define AttributeType_hpp
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGAttributeType.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGAttributeType.h>
 
 namespace OG {
 struct AttributeType {
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Comparison/OGComparisonPrivate.h b/Sources/OpenGraphCxx/include/OpenGraphCxx/Comparison/OGComparisonPrivate.h
index 2595f6e2..44024387 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Comparison/OGComparisonPrivate.h
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Comparison/OGComparisonPrivate.h
@@ -29,9 +29,9 @@
 #ifndef OGComparisonPrivate_h
 #define OGComparisonPrivate_h
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGComparison.h>
-#include <OpenGraphC/OGTypeID.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGComparison.h>
+#include <OpenGraph/OGTypeID.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ClosureFunction.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ClosureFunction.hpp
index 78147860..be5de90a 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ClosureFunction.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ClosureFunction.hpp
@@ -8,7 +8,7 @@
 #ifndef ClosureFunction_hpp
 #define ClosureFunction_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <functional>
 
 OG_ASSUME_NONNULL_BEGIN
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page.hpp
index b72b6b09..8d197d2e 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page.hpp
@@ -5,7 +5,7 @@
 #ifndef page_hpp
 #define page_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <OpenGraphCxx/Data/ptr.hpp>
 
 namespace OG {
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page_const.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page_const.hpp
index ff75537b..516c553d 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page_const.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/page_const.hpp
@@ -5,7 +5,7 @@
 #ifndef page_const_hpp
 #define page_const_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 namespace OG {
 namespace data {
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ptr.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ptr.hpp
index 604fd3fd..87209e41 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ptr.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/ptr.hpp
@@ -8,7 +8,7 @@
 #ifndef ptr_hpp
 #define ptr_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <OpenGraphCxx/Data/table.hpp>
 #include <bitset>
 #include <OpenGraphCxx/Data/page_const.hpp>
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/table.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/table.hpp
index 1b6f8ed0..cb1c16aa 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/table.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/table.hpp
@@ -5,7 +5,7 @@
 #ifndef table_hpp
 #define table_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <OpenGraphCxx/Vector/vector.hpp>
 #if OG_TARGET_OS_DARWIN
 #include <mach/vm_types.h>
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/zone.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/zone.hpp
index c2c83a3e..a8b29ca4 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/zone.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Data/zone.hpp
@@ -5,7 +5,7 @@
 #ifndef zone_hpp
 #define zone_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <OpenGraphCxx/Data/ptr.hpp>
 
 namespace OG {
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/DebugServer/og-debug-server.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/DebugServer/og-debug-server.hpp
index efa57d99..f3c76f32 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/DebugServer/og-debug-server.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/DebugServer/og-debug-server.hpp
@@ -8,9 +8,9 @@
 #ifndef og_debug_server_hpp
 #define og_debug_server_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #if OG_TARGET_OS_DARWIN
-#include <OpenGraphC/OGDebugServer.h>
+#include <OpenGraph/OGDebugServer.h>
 #include <OpenGraphCxx/Vector/vector.hpp>
 #include <dispatch/dispatch.h>
 #include <memory>
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Graph.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Graph.hpp
index 4db8d92a..43096e11 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Graph.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Graph.hpp
@@ -6,10 +6,10 @@
 #ifndef Graph_hpp
 #define Graph_hpp
 
-#include <OpenGraphC/OGBase.h>
-#include <OpenGraphC/OGGraph.h>
-#include <OpenGraphC/OGUniqueID.h>
-#include <OpenGraphC/Private/CFRuntime.h>
+#include <OpenGraph/OGBase.h>
+#include <OpenGraph/OGGraph.h>
+#include <OpenGraph/OGUniqueID.h>
+#include <OpenGraph/Private/CFRuntime.h>
 #include <OpenGraphCxx/Data/ClosureFunction.hpp>
 
 OG_ASSUME_NONNULL_BEGIN
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Subgraph.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Subgraph.hpp
index c55cc08d..b1a54b27 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Subgraph.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Graph/Subgraph.hpp
@@ -8,7 +8,7 @@
 #ifndef Subgraph_hpp
 #define Subgraph_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraphCxx/Attribute/AttributeID.hpp>
 #include <OpenGraphCxx/Data/ClosureFunction.hpp>
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Runtime/metadata.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Runtime/metadata.hpp
index b27912a8..6826ab81 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Runtime/metadata.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Runtime/metadata.hpp
@@ -8,7 +8,7 @@
 #ifndef metadata_hpp
 #define metadata_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
 #include <swift/Runtime/Metadata.h>
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/assert.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/assert.hpp
index 683c9c7f..ca05e342 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/assert.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/assert.hpp
@@ -5,7 +5,7 @@
 #ifndef assert_hpp
 #define assert_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 namespace OG {
 void precondition_failure(const char *format, ...) __cold __dead2;
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/env.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/env.hpp
index ae562f38..29b539b4 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/env.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/env.hpp
@@ -8,7 +8,7 @@
 #ifndef env_hpp
 #define env_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 namespace OG {
 OG_INLINE
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/log.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/log.hpp
index ef2bc5c6..affa31d3 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/log.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/log.hpp
@@ -8,7 +8,7 @@
 #ifndef log_hpp
 #define log_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 #if OG_TARGET_OS_DARWIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/realloc_vector.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/realloc_vector.hpp
index ec1c006a..89f64c92 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/realloc_vector.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Util/realloc_vector.hpp
@@ -8,7 +8,7 @@
 #ifndef realloc_vector_hpp
 #define realloc_vector_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 
 OG_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/vector.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/vector.hpp
index f785ac02..3f55ed74 100644
--- a/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/vector.hpp
+++ b/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/vector.hpp
@@ -8,7 +8,7 @@
 #ifndef vector_hpp
 #define vector_hpp
 
-#include <OpenGraphC/OGBase.h>
+#include <OpenGraph/OGBase.h>
 #include <concepts>
 #include <iterator>
 #include <memory>
diff --git a/Sources/OpenGraphCxx/include/module.modulemap b/Sources/OpenGraphCxx/include/module.modulemap
index da511625..4976a40e 100644
--- a/Sources/OpenGraphCxx/include/module.modulemap
+++ b/Sources/OpenGraphCxx/include/module.modulemap
@@ -3,6 +3,6 @@ module OpenGraphCxx {
 }
 
 module OpenGraphCxx.C {
-    umbrella header "OpenGraphC/OpenGraph-umbrella.h"
+    umbrella header "OpenGraph/OpenGraph-umbrella.h"
     export *
 }