From e2bf256650a13f2d40614e83c3fa5c973bafcd2d Mon Sep 17 00:00:00 2001
From: Darby Johnston <darbyjohnston@yahoo.com>
Date: Tue, 11 Nov 2025 09:02:35 -0800
Subject: [PATCH 1/2] Remove patch version from namespace

Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
---
 examples/conform.cpp                                       | 2 +-
 examples/flatten_video_tracks.cpp                          | 2 +-
 examples/io_perf_test.cpp                                  | 2 +-
 examples/python_adapters_child_process.cpp                 | 2 +-
 examples/python_adapters_embed.cpp                         | 2 +-
 examples/summarize_timing.cpp                              | 4 ++--
 examples/upgrade_downgrade_example.cpp                     | 2 +-
 examples/util.cpp                                          | 2 +-
 examples/util.h                                            | 2 +-
 src/opentime/errorStatus.cpp                               | 4 ++--
 src/opentime/errorStatus.h                                 | 4 ++--
 src/opentime/rationalTime.cpp                              | 4 ++--
 src/opentime/rationalTime.h                                | 4 ++--
 src/opentime/stringPrintf.h                                | 4 ++--
 src/opentime/timeRange.h                                   | 4 ++--
 src/opentime/timeTransform.h                               | 4 ++--
 src/opentime/version.h.in                                  | 5 +++--
 src/opentimelineio/CORE_VERSION_MAP.cpp                    | 4 ++--
 src/opentimelineio/algo/editAlgorithm.cpp                  | 6 +++---
 src/opentimelineio/algo/editAlgorithm.h                    | 4 ++--
 src/opentimelineio/anyDictionary.h                         | 4 ++--
 src/opentimelineio/anyVector.h                             | 4 ++--
 src/opentimelineio/clip.cpp                                | 4 ++--
 src/opentimelineio/clip.h                                  | 4 ++--
 src/opentimelineio/color.cpp                               | 4 ++--
 src/opentimelineio/color.h                                 | 4 ++--
 src/opentimelineio/composable.cpp                          | 4 ++--
 src/opentimelineio/composable.h                            | 4 ++--
 src/opentimelineio/composition.cpp                         | 4 ++--
 src/opentimelineio/composition.h                           | 4 ++--
 src/opentimelineio/deserialization.cpp                     | 4 ++--
 src/opentimelineio/deserialization.h                       | 4 ++--
 src/opentimelineio/effect.cpp                              | 4 ++--
 src/opentimelineio/effect.h                                | 4 ++--
 src/opentimelineio/errorStatus.cpp                         | 4 ++--
 src/opentimelineio/errorStatus.h                           | 4 ++--
 src/opentimelineio/externalReference.cpp                   | 4 ++--
 src/opentimelineio/externalReference.h                     | 4 ++--
 src/opentimelineio/freezeFrame.cpp                         | 4 ++--
 src/opentimelineio/freezeFrame.h                           | 4 ++--
 src/opentimelineio/gap.cpp                                 | 4 ++--
 src/opentimelineio/gap.h                                   | 4 ++--
 src/opentimelineio/generatorReference.cpp                  | 4 ++--
 src/opentimelineio/generatorReference.h                    | 4 ++--
 src/opentimelineio/imageSequenceReference.cpp              | 4 ++--
 src/opentimelineio/imageSequenceReference.h                | 4 ++--
 src/opentimelineio/item.cpp                                | 4 ++--
 src/opentimelineio/item.h                                  | 4 ++--
 src/opentimelineio/linearTimeWarp.cpp                      | 4 ++--
 src/opentimelineio/linearTimeWarp.h                        | 4 ++--
 src/opentimelineio/marker.cpp                              | 4 ++--
 src/opentimelineio/marker.h                                | 4 ++--
 src/opentimelineio/mediaReference.cpp                      | 4 ++--
 src/opentimelineio/mediaReference.h                        | 4 ++--
 src/opentimelineio/missingReference.cpp                    | 4 ++--
 src/opentimelineio/missingReference.h                      | 4 ++--
 src/opentimelineio/safely_typed_any.cpp                    | 4 ++--
 src/opentimelineio/safely_typed_any.h                      | 4 ++--
 src/opentimelineio/serializableCollection.cpp              | 4 ++--
 src/opentimelineio/serializableCollection.h                | 4 ++--
 src/opentimelineio/serializableObject.cpp                  | 4 ++--
 src/opentimelineio/serializableObject.h                    | 4 ++--
 src/opentimelineio/serializableObjectWithMetadata.cpp      | 4 ++--
 src/opentimelineio/serializableObjectWithMetadata.h        | 4 ++--
 src/opentimelineio/serialization.cpp                       | 4 ++--
 src/opentimelineio/serialization.h                         | 4 ++--
 src/opentimelineio/stack.cpp                               | 4 ++--
 src/opentimelineio/stack.h                                 | 4 ++--
 src/opentimelineio/stackAlgorithm.cpp                      | 4 ++--
 src/opentimelineio/stackAlgorithm.h                        | 4 ++--
 src/opentimelineio/stringUtils.cpp                         | 4 ++--
 src/opentimelineio/stringUtils.h                           | 4 ++--
 src/opentimelineio/timeEffect.cpp                          | 4 ++--
 src/opentimelineio/timeEffect.h                            | 4 ++--
 src/opentimelineio/timeline.cpp                            | 4 ++--
 src/opentimelineio/timeline.h                              | 4 ++--
 src/opentimelineio/track.cpp                               | 4 ++--
 src/opentimelineio/track.h                                 | 4 ++--
 src/opentimelineio/trackAlgorithm.cpp                      | 4 ++--
 src/opentimelineio/trackAlgorithm.h                        | 4 ++--
 src/opentimelineio/transition.cpp                          | 4 ++--
 src/opentimelineio/transition.h                            | 4 ++--
 src/opentimelineio/typeRegistry.cpp                        | 4 ++--
 src/opentimelineio/typeRegistry.h                          | 4 ++--
 src/opentimelineio/unknownSchema.cpp                       | 4 ++--
 src/opentimelineio/unknownSchema.h                         | 4 ++--
 src/opentimelineio/vectorIndexing.h                        | 4 ++--
 src/opentimelineio/version.h.in                            | 7 ++++---
 .../opentimelineio-bindings/otio_errorStatusHandler.h      | 2 +-
 src/py-opentimelineio/opentimelineio-bindings/otio_utils.h | 2 +-
 tests/test_clip.cpp                                        | 4 ++--
 tests/test_composition.cpp                                 | 4 ++--
 tests/test_editAlgorithm.cpp                               | 4 ++--
 tests/test_opentime.cpp                                    | 2 +-
 tests/test_serializableCollection.cpp                      | 4 ++--
 tests/test_serialization.cpp                               | 4 ++--
 tests/test_stack_algo.cpp                                  | 4 ++--
 tests/test_timeline.cpp                                    | 4 ++--
 tests/test_track.cpp                                       | 4 ++--
 99 files changed, 191 insertions(+), 189 deletions(-)

diff --git a/examples/conform.cpp b/examples/conform.cpp
index b0b934797a..808a6b0732 100644
--- a/examples/conform.cpp
+++ b/examples/conform.cpp
@@ -28,7 +28,7 @@
 
 #include <iostream>
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 // Look for media with this name in this folder.
 std::string find_matching_media(std::string const& name, std::string const& folder)
diff --git a/examples/flatten_video_tracks.cpp b/examples/flatten_video_tracks.cpp
index 203b2a36fc..9d8930ae94 100644
--- a/examples/flatten_video_tracks.cpp
+++ b/examples/flatten_video_tracks.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <sstream>
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int main(int argc, char** argv)
 {
diff --git a/examples/io_perf_test.cpp b/examples/io_perf_test.cpp
index 067d063e3a..e2c6725299 100644
--- a/examples/io_perf_test.cpp
+++ b/examples/io_perf_test.cpp
@@ -11,7 +11,7 @@
 
 #include "util.h"
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 using chrono_time_point = std::chrono::steady_clock::time_point;
 
diff --git a/examples/python_adapters_child_process.cpp b/examples/python_adapters_child_process.cpp
index 336961e4a8..91aa3fa3d7 100644
--- a/examples/python_adapters_child_process.cpp
+++ b/examples/python_adapters_child_process.cpp
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #endif // _WINDOWS
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 class PythonAdapters
 {
diff --git a/examples/python_adapters_embed.cpp b/examples/python_adapters_embed.cpp
index 5a6e675548..d85b27bc6a 100644
--- a/examples/python_adapters_embed.cpp
+++ b/examples/python_adapters_embed.cpp
@@ -27,7 +27,7 @@
 #include <combaseapi.h>
 #endif // _WINDOWS
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 class PythonAdapters
 {
diff --git a/examples/summarize_timing.cpp b/examples/summarize_timing.cpp
index 9abf35271a..e8f4f87615 100644
--- a/examples/summarize_timing.cpp
+++ b/examples/summarize_timing.cpp
@@ -17,8 +17,8 @@
 
 #include <iostream>
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
-namespace otime = opentime::OPENTIME_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
+namespace otime = opentime::OPENTIME_VERSION_NS;
 
 void summarize_effects(otio::SerializableObject::Retainer<otio::Item> const& item)
 {
diff --git a/examples/upgrade_downgrade_example.cpp b/examples/upgrade_downgrade_example.cpp
index 532fc9abc8..185725e3bf 100644
--- a/examples/upgrade_downgrade_example.cpp
+++ b/examples/upgrade_downgrade_example.cpp
@@ -8,7 +8,7 @@
 // demonstrates a minimal custom SerializableObject written in C++ with upgrade
 // and downgrade functions
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 // define the custom class
 class SimpleClass : public otio::SerializableObject
diff --git a/examples/util.cpp b/examples/util.cpp
index cc54d05aff..df05706ed6 100644
--- a/examples/util.cpp
+++ b/examples/util.cpp
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #endif // _WINDOWS
 
-namespace otio = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otio = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 namespace examples {
 
diff --git a/examples/util.h b/examples/util.h
index 924fbb38e4..f3aecd0203 100644
--- a/examples/util.h
+++ b/examples/util.h
@@ -22,6 +22,6 @@ std::string create_temp_dir();
 std::vector<std::string> glob(std::string const& path, std::string const& pattern);
 
 // Print an error to std::cerr.
-void print_error(opentimelineio::OPENTIMELINEIO_VERSION::ErrorStatus const&);
+void print_error(opentimelineio::OPENTIMELINEIO_VERSION_NS::ErrorStatus const&);
 
 }
diff --git a/src/opentime/errorStatus.cpp b/src/opentime/errorStatus.cpp
index de4dbe0095..0f8db6d5e0 100644
--- a/src/opentime/errorStatus.cpp
+++ b/src/opentime/errorStatus.cpp
@@ -3,7 +3,7 @@
 
 #include "opentime/errorStatus.h"
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 std::string
 ErrorStatus::outcome_to_string(Outcome o)
@@ -29,4 +29,4 @@ ErrorStatus::outcome_to_string(Outcome o)
     };
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/errorStatus.h b/src/opentime/errorStatus.h
index 5c7e6eace6..a251277c98 100644
--- a/src/opentime/errorStatus.h
+++ b/src/opentime/errorStatus.h
@@ -7,7 +7,7 @@
 #include "opentime/version.h"
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This struct represents the return status of a function.
 struct OPENTIME_API_TYPE ErrorStatus
@@ -65,4 +65,4 @@ is_error(const ErrorStatus* es) noexcept
     return es && ErrorStatus::Outcome::OK != es->outcome;
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/rationalTime.cpp b/src/opentime/rationalTime.cpp
index a24dd273e5..7ef7768b16 100644
--- a/src/opentime/rationalTime.cpp
+++ b/src/opentime/rationalTime.cpp
@@ -9,7 +9,7 @@
 #include <cmath>
 #include <vector>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 RationalTime RationalTime::_invalid_time{ 0, RationalTime::_invalid_rate };
 
@@ -661,4 +661,4 @@ RationalTime::to_time_string() const
         microseconds_str.c_str());
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/rationalTime.h b/src/opentime/rationalTime.h
index 0a26fe0de6..c8df84d392 100644
--- a/src/opentime/rationalTime.h
+++ b/src/opentime/rationalTime.h
@@ -10,7 +10,7 @@
 #include <limits>
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This enumeration provides options for drop frame timecode.
 enum OPENTIME_API_TYPE IsDropFrameRate : int
@@ -423,4 +423,4 @@ class OPENTIME_API_TYPE RationalTime
     }
 };
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/stringPrintf.h b/src/opentime/stringPrintf.h
index d7801d706f..6966d16d22 100644
--- a/src/opentime/stringPrintf.h
+++ b/src/opentime/stringPrintf.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This provides printf style functionality for std::string.
 template <typename... Args>
@@ -27,4 +27,4 @@ string_printf(char const* format, Args... args)
     return std::string(buf.get());
 }
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/timeRange.h b/src/opentime/timeRange.h
index 4f6dc5e10a..e0ea251234 100644
--- a/src/opentime/timeRange.h
+++ b/src/opentime/timeRange.h
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief This default epsilon_s value is used in comparison between floating numbers.
 ///
@@ -460,4 +460,4 @@ class OPENTIME_API_TYPE TimeRange
     }
 };
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/timeTransform.h b/src/opentime/timeTransform.h
index c1ce3a7635..bdbc4e14e6 100644
--- a/src/opentime/timeTransform.h
+++ b/src/opentime/timeTransform.h
@@ -8,7 +8,7 @@
 #include "opentime/version.h"
 #include <string>
 
-namespace opentime { namespace OPENTIME_VERSION {
+namespace opentime { namespace OPENTIME_VERSION_NS {
 
 /// @brief One-dimensional time transform.
 class OPENTIME_API_TYPE TimeTransform
@@ -82,4 +82,4 @@ class OPENTIME_API_TYPE TimeTransform
     double       _rate;
 };
 
-}} // namespace opentime::OPENTIME_VERSION
+}} // namespace opentime::OPENTIME_VERSION_NS
diff --git a/src/opentime/version.h.in b/src/opentime/version.h.in
index c1265faf4a..cd8761cc58 100644
--- a/src/opentime/version.h.in
+++ b/src/opentime/version.h.in
@@ -7,10 +7,11 @@
 #define OPENTIME_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define OPENTIME_VERSION_PATCH @PROJECT_VERSION_PATCH@
 #define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@
+#define OPENTIME_VERSION_NS v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@
 
 namespace opentime {
-namespace OPENTIME_VERSION {
+namespace OPENTIME_VERSION_NS {
 }
 
-using namespace OPENTIME_VERSION;
+using namespace OPENTIME_VERSION_NS;
 } // namespace opentime
diff --git a/src/opentimelineio/CORE_VERSION_MAP.cpp b/src/opentimelineio/CORE_VERSION_MAP.cpp
index 80234fe6be..8d6e58da69 100644
--- a/src/opentimelineio/CORE_VERSION_MAP.cpp
+++ b/src/opentimelineio/CORE_VERSION_MAP.cpp
@@ -12,7 +12,7 @@
 // version of an older library.
 #include "opentimelineio/typeRegistry.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 const label_to_schema_version_map CORE_VERSION_MAP{
     { "0.14.0",
@@ -241,4 +241,4 @@ const label_to_schema_version_map CORE_VERSION_MAP{
     // {next}
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/algo/editAlgorithm.cpp b/src/opentimelineio/algo/editAlgorithm.cpp
index b12d7a5d04..4619dc7608 100644
--- a/src/opentimelineio/algo/editAlgorithm.cpp
+++ b/src/opentimelineio/algo/editAlgorithm.cpp
@@ -11,12 +11,12 @@
 #include "opentimelineio/track.h"
 #include "opentimelineio/transition.h"
 
-namespace otime = opentime::OPENTIME_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
 
 using otime::RationalTime;
 using otime::TimeRange;
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { namespace algo {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS { namespace algo {
 
 
 #include <iostream>
@@ -883,4 +883,4 @@ void remove(
     }
 }
             
-}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION::algo
+}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS::algo
diff --git a/src/opentimelineio/algo/editAlgorithm.h b/src/opentimelineio/algo/editAlgorithm.h
index 39283e8107..ca18baba13 100644
--- a/src/opentimelineio/algo/editAlgorithm.h
+++ b/src/opentimelineio/algo/editAlgorithm.h
@@ -5,7 +5,7 @@
 
 #include "opentimelineio/composition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { namespace algo {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS { namespace algo {
 
 //! Enum used by 3/4 Point Edit (aka. as fill)
 enum class ReferencePoint
@@ -214,4 +214,4 @@ OTIO_API void remove(
     Item*               fill_template = nullptr,
     ErrorStatus*        error_status = nullptr);
 
-}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION::algo
+}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS::algo
diff --git a/src/opentimelineio/anyDictionary.h b/src/opentimelineio/anyDictionary.h
index 4fd05d1035..abd81fb23b 100644
--- a/src/opentimelineio/anyDictionary.h
+++ b/src/opentimelineio/anyDictionary.h
@@ -11,7 +11,7 @@
 #include <map>
 #include <string>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief This class provides a replacement for "std::map<std::string, std::any>".
 ///
@@ -290,4 +290,4 @@ class OTIO_API_TYPE AnyDictionary : private std::map<std::string, std::any>
     }
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/anyVector.h b/src/opentimelineio/anyVector.h
index 21c6208a20..124604f2f7 100644
--- a/src/opentimelineio/anyVector.h
+++ b/src/opentimelineio/anyVector.h
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <vector>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief This class provides a replacement for "std::vector<std::any>".
 ///
@@ -176,4 +176,4 @@ class OTIO_API_TYPE AnyVector : private std::vector<std::any>
     MutationStamp* _mutation_stamp = nullptr;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/clip.cpp b/src/opentimelineio/clip.cpp
index 4a60f5eaeb..a2e8acced4 100644
--- a/src/opentimelineio/clip.cpp
+++ b/src/opentimelineio/clip.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/clip.h"
 #include "opentimelineio/missingReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 char constexpr Clip::default_media_key[];
 
@@ -224,4 +224,4 @@ Clip::available_image_bounds(ErrorStatus* error_status) const
     return active_media->available_image_bounds();
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/clip.h b/src/opentimelineio/clip.h
index 220597f7a5..37878a0ea9 100644
--- a/src/opentimelineio/clip.h
+++ b/src/opentimelineio/clip.h
@@ -7,7 +7,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A clip is a segment of editable media (usually audio or video).
 ///
@@ -106,4 +106,4 @@ class OTIO_API_TYPE Clip : public Item
     std::string                                     _active_media_reference_key;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/color.cpp b/src/opentimelineio/color.cpp
index 6581592303..dad8ddec22 100644
--- a/src/opentimelineio/color.cpp
+++ b/src/opentimelineio/color.cpp
@@ -6,7 +6,7 @@
 
 #include "opentimelineio/color.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Color::Color(
     double const       r,
@@ -177,4 +177,4 @@ Color::to_rgba_float_list()
     return { _r, _g, _b, _a };
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
\ No newline at end of file
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
\ No newline at end of file
diff --git a/src/opentimelineio/color.h b/src/opentimelineio/color.h
index e8c1119ab4..bb47b776cd 100644
--- a/src/opentimelineio/color.h
+++ b/src/opentimelineio/color.h
@@ -9,7 +9,7 @@
 #include "opentimelineio/export.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Color consists of red, green, blue,
 /// and alpha double floating point values,
@@ -88,4 +88,4 @@ class OTIO_API_TYPE Color
     std::string _name;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
\ No newline at end of file
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
\ No newline at end of file
diff --git a/src/opentimelineio/composable.cpp b/src/opentimelineio/composable.cpp
index 0a6f3b957c..e00d6791c4 100644
--- a/src/opentimelineio/composable.cpp
+++ b/src/opentimelineio/composable.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/composable.h"
 #include "opentimelineio/composition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Composable::Composable(std::string const& name, AnyDictionary const& metadata)
     : Parent(name, metadata)
@@ -81,4 +81,4 @@ Composable::available_image_bounds(ErrorStatus* error_status) const
     return std::optional<IMATH_NAMESPACE::Box2d>();
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/composable.h b/src/opentimelineio/composable.h
index 9b8def093a..a6f29f7c3d 100644
--- a/src/opentimelineio/composable.h
+++ b/src/opentimelineio/composable.h
@@ -8,7 +8,7 @@
 
 #include <Imath/ImathBox.h>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Composition;
 
@@ -68,4 +68,4 @@ class OTIO_API_TYPE Composable : public SerializableObjectWithMetadata
     friend class Composition;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/composition.cpp b/src/opentimelineio/composition.cpp
index 3021a77a6a..57e3733800 100644
--- a/src/opentimelineio/composition.cpp
+++ b/src/opentimelineio/composition.cpp
@@ -8,7 +8,7 @@
 #include <assert.h>
 #include <set>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Composition::Composition(
     std::string const&              name,
@@ -726,4 +726,4 @@ Composition::find_clips(
     return find_children<Clip>(error_status, search_range, shallow_search);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/composition.h b/src/opentimelineio/composition.h
index 8392f1bb92..e2a72a470d 100644
--- a/src/opentimelineio/composition.h
+++ b/src/opentimelineio/composition.h
@@ -7,7 +7,7 @@
 #include "opentimelineio/version.h"
 #include <set>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Clip;
 
@@ -293,4 +293,4 @@ Composition::find_children(
     return out;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/deserialization.cpp b/src/opentimelineio/deserialization.cpp
index 6fc5c75dbe..51f85c6c3d 100644
--- a/src/opentimelineio/deserialization.cpp
+++ b/src/opentimelineio/deserialization.cpp
@@ -25,7 +25,7 @@
 #    include <windows.h>
 #endif
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class JSONDecoder : public OTIO_rapidjson::
                         BaseReaderHandler<OTIO_rapidjson::UTF8<>, JSONDecoder>
@@ -983,4 +983,4 @@ deserialize_json_from_file(
     return true;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/deserialization.h b/src/opentimelineio/deserialization.h
index 95859ec286..610a7f7d36 100644
--- a/src/opentimelineio/deserialization.h
+++ b/src/opentimelineio/deserialization.h
@@ -9,7 +9,7 @@
 #include <any>
 #include <string>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Deserialize JSON data from a string.
 OTIO_API bool deserialize_json_from_string(
@@ -23,4 +23,4 @@ OTIO_API bool deserialize_json_from_file(
     std::any*          destination,
     ErrorStatus*       error_status = nullptr);
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/effect.cpp b/src/opentimelineio/effect.cpp
index 5923690ba5..c83cf6437b 100644
--- a/src/opentimelineio/effect.cpp
+++ b/src/opentimelineio/effect.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/effect.h"
 #include "opentimelineio/missingReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Effect::Effect(
     std::string const&   name,
@@ -35,4 +35,4 @@ Effect::write_to(Writer& writer) const
     writer.write("enabled", _enabled);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/effect.h b/src/opentimelineio/effect.h
index fb43265fc4..6007268698 100644
--- a/src/opentimelineio/effect.h
+++ b/src/opentimelineio/effect.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/serializableObjectWithMetadata.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief An effect that can be applied to an item, such as an image or audio filter.
 class OTIO_API_TYPE Effect : public SerializableObjectWithMetadata
@@ -59,4 +59,4 @@ class OTIO_API_TYPE Effect : public SerializableObjectWithMetadata
     bool        _enabled;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/errorStatus.cpp b/src/opentimelineio/errorStatus.cpp
index e19f18e775..8b33003bf9 100644
--- a/src/opentimelineio/errorStatus.cpp
+++ b/src/opentimelineio/errorStatus.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/errorStatus.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 std::string
 ErrorStatus::outcome_to_string(Outcome o)
@@ -71,4 +71,4 @@ ErrorStatus::outcome_to_string(Outcome o)
     };
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/errorStatus.h b/src/opentimelineio/errorStatus.h
index b9386c8e0d..ca991a1a1c 100644
--- a/src/opentimelineio/errorStatus.h
+++ b/src/opentimelineio/errorStatus.h
@@ -7,7 +7,7 @@
 #include "opentimelineio/version.h"
 #include <string>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class SerializableObject;
 
@@ -110,4 +110,4 @@ is_error(const ErrorStatus* es) noexcept
     return es && ErrorStatus::Outcome::OK != es->outcome;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/externalReference.cpp b/src/opentimelineio/externalReference.cpp
index 41b6561e38..46740dde60 100644
--- a/src/opentimelineio/externalReference.cpp
+++ b/src/opentimelineio/externalReference.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/externalReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 ExternalReference::ExternalReference(
     std::string const&                           target_url,
@@ -30,4 +30,4 @@ ExternalReference::write_to(Writer& writer) const
     writer.write("target_url", _target_url);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/externalReference.h b/src/opentimelineio/externalReference.h
index a04fd52852..ddb028f4fa 100644
--- a/src/opentimelineio/externalReference.h
+++ b/src/opentimelineio/externalReference.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A reference to a media file.
 class OTIO_API_TYPE ExternalReference final : public MediaReference
@@ -53,4 +53,4 @@ class OTIO_API_TYPE ExternalReference final : public MediaReference
     std::string _target_url;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/freezeFrame.cpp b/src/opentimelineio/freezeFrame.cpp
index a24c2e4a5c..02d156032a 100644
--- a/src/opentimelineio/freezeFrame.cpp
+++ b/src/opentimelineio/freezeFrame.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/freezeFrame.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 FreezeFrame::FreezeFrame(std::string const& name, AnyDictionary const& metadata)
     : Parent(name, "FreezeFrame", 0.0, metadata)
@@ -12,4 +12,4 @@ FreezeFrame::FreezeFrame(std::string const& name, AnyDictionary const& metadata)
 FreezeFrame::~FreezeFrame()
 {}
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/freezeFrame.h b/src/opentimelineio/freezeFrame.h
index b7a31a3e6a..2c61097b41 100644
--- a/src/opentimelineio/freezeFrame.h
+++ b/src/opentimelineio/freezeFrame.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/linearTimeWarp.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Hold the first frame of the clip for the duration of the clip.
 class OTIO_API_TYPE FreezeFrame : public LinearTimeWarp
@@ -33,4 +33,4 @@ class OTIO_API_TYPE FreezeFrame : public LinearTimeWarp
     virtual ~FreezeFrame();
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/gap.cpp b/src/opentimelineio/gap.cpp
index b310d4df84..2fd15646a2 100644
--- a/src/opentimelineio/gap.cpp
+++ b/src/opentimelineio/gap.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/gap.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Gap::Gap(
     TimeRange const&            source_range,
@@ -49,4 +49,4 @@ Gap::write_to(Writer& writer) const
     Parent::write_to(writer);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/gap.h b/src/opentimelineio/gap.h
index 87e6e77e72..eb1857227e 100644
--- a/src/opentimelineio/gap.h
+++ b/src/opentimelineio/gap.h
@@ -7,7 +7,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief An empty item within a timeline.
 class OTIO_API_TYPE Gap : public Item
@@ -62,4 +62,4 @@ class OTIO_API_TYPE Gap : public Item
     void write_to(Writer&) const override;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/generatorReference.cpp b/src/opentimelineio/generatorReference.cpp
index 7e4c133b66..3932c75b2a 100644
--- a/src/opentimelineio/generatorReference.cpp
+++ b/src/opentimelineio/generatorReference.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/generatorReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 GeneratorReference::GeneratorReference(
     std::string const&                           name,
@@ -36,4 +36,4 @@ GeneratorReference::write_to(Writer& writer) const
     writer.write("parameters", _parameters);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/generatorReference.h b/src/opentimelineio/generatorReference.h
index c5eeabaddd..8884bd81e5 100644
--- a/src/opentimelineio/generatorReference.h
+++ b/src/opentimelineio/generatorReference.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A reference to dynamically generated media.
 class OTIO_API_TYPE GeneratorReference final : public MediaReference
@@ -64,4 +64,4 @@ class OTIO_API_TYPE GeneratorReference final : public MediaReference
     AnyDictionary _parameters;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/imageSequenceReference.cpp b/src/opentimelineio/imageSequenceReference.cpp
index 88e9568775..4ded28af7b 100644
--- a/src/opentimelineio/imageSequenceReference.cpp
+++ b/src/opentimelineio/imageSequenceReference.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/imageSequenceReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 ImageSequenceReference::ImageSequenceReference(
     std::string const&                           target_url_base,
@@ -268,4 +268,4 @@ ImageSequenceReference::write_to(Writer& writer) const
     }
     writer.write("missing_frame_policy", missing_frame_policy_value);
 }
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/imageSequenceReference.h b/src/opentimelineio/imageSequenceReference.h
index c629ef2249..6754f4db15 100644
--- a/src/opentimelineio/imageSequenceReference.h
+++ b/src/opentimelineio/imageSequenceReference.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A reference to an image sequence.
 ///
@@ -175,4 +175,4 @@ class OTIO_API_TYPE ImageSequenceReference final : public MediaReference
     RationalTime frame_duration() const noexcept;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/item.cpp b/src/opentimelineio/item.cpp
index 8784b19360..e2e1bcb4ff 100644
--- a/src/opentimelineio/item.cpp
+++ b/src/opentimelineio/item.cpp
@@ -8,7 +8,7 @@
 
 #include <assert.h>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Item::Item(
     std::string const&              name,
@@ -193,4 +193,4 @@ Item::write_to(Writer& writer) const
     writer.write("color", _color);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/item.h b/src/opentimelineio/item.h
index f84d619fb6..5a7a06a33c 100644
--- a/src/opentimelineio/item.h
+++ b/src/opentimelineio/item.h
@@ -9,7 +9,7 @@
 #include "opentimelineio/errorStatus.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Effect;
 class Marker;
@@ -139,4 +139,4 @@ class OTIO_API_TYPE Item : public Composable
     bool                          _enabled;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/linearTimeWarp.cpp b/src/opentimelineio/linearTimeWarp.cpp
index 8700e3a993..cb8b5ef939 100644
--- a/src/opentimelineio/linearTimeWarp.cpp
+++ b/src/opentimelineio/linearTimeWarp.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/linearTimeWarp.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 LinearTimeWarp::LinearTimeWarp(
     std::string const&   name,
@@ -31,4 +31,4 @@ LinearTimeWarp::write_to(Writer& writer) const
     writer.write("time_scalar", _time_scalar);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/linearTimeWarp.h b/src/opentimelineio/linearTimeWarp.h
index 12df1ca997..effd401c26 100644
--- a/src/opentimelineio/linearTimeWarp.h
+++ b/src/opentimelineio/linearTimeWarp.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/timeEffect.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A time warp that applies a linear speed up or slow down across the entire clip.
 class OTIO_API_TYPE LinearTimeWarp : public TimeEffect
@@ -52,4 +52,4 @@ class OTIO_API_TYPE LinearTimeWarp : public TimeEffect
     double _time_scalar;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/marker.cpp b/src/opentimelineio/marker.cpp
index aa3e6445b1..558a0fc902 100644
--- a/src/opentimelineio/marker.cpp
+++ b/src/opentimelineio/marker.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/marker.h"
 #include "opentimelineio/missingReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Marker::Marker(
     std::string const&   name,
@@ -39,4 +39,4 @@ Marker::write_to(Writer& writer) const
     writer.write("comment", _comment);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/marker.h b/src/opentimelineio/marker.h
index 382a795c6f..6ec1a775f3 100644
--- a/src/opentimelineio/marker.h
+++ b/src/opentimelineio/marker.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/serializableObjectWithMetadata.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A marker indicates a marked range of time on an item in a timeline,
 /// usually with a name, color or other metadata.
@@ -88,4 +88,4 @@ class OTIO_API_TYPE Marker : public SerializableObjectWithMetadata
     std::string _comment;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/mediaReference.cpp b/src/opentimelineio/mediaReference.cpp
index 8cb1f9e309..6219cfeaa7 100644
--- a/src/opentimelineio/mediaReference.cpp
+++ b/src/opentimelineio/mediaReference.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/mediaReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 MediaReference::MediaReference(
     std::string const&                           name,
@@ -42,4 +42,4 @@ MediaReference::write_to(Writer& writer) const
     writer.write("available_image_bounds", _available_image_bounds);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/mediaReference.h b/src/opentimelineio/mediaReference.h
index 90fdfbac87..1d2c95dcf9 100644
--- a/src/opentimelineio/mediaReference.h
+++ b/src/opentimelineio/mediaReference.h
@@ -8,7 +8,7 @@
 
 #include <Imath/ImathBox.h>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 using namespace opentime;
 
@@ -77,4 +77,4 @@ class OTIO_API_TYPE MediaReference : public SerializableObjectWithMetadata
     std::optional<IMATH_NAMESPACE::Box2d> _available_image_bounds;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/missingReference.cpp b/src/opentimelineio/missingReference.cpp
index fc901505de..4b7b76784c 100644
--- a/src/opentimelineio/missingReference.cpp
+++ b/src/opentimelineio/missingReference.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/missingReference.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 MissingReference::MissingReference(
     std::string const&                           name,
@@ -34,4 +34,4 @@ MissingReference::write_to(Writer& writer) const
     Parent::write_to(writer);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/missingReference.h b/src/opentimelineio/missingReference.h
index 2f8c28dd78..1eefd49fff 100644
--- a/src/opentimelineio/missingReference.h
+++ b/src/opentimelineio/missingReference.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/mediaReference.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Represents media for which a concrete reference is missing.
 ///
@@ -46,4 +46,4 @@ class OTIO_API_TYPE MissingReference final : public MediaReference
     void write_to(Writer&) const override;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/safely_typed_any.cpp b/src/opentimelineio/safely_typed_any.cpp
index 3643d22303..b0c02318fb 100644
--- a/src/opentimelineio/safely_typed_any.cpp
+++ b/src/opentimelineio/safely_typed_any.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/safely_typed_any.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 std::any
 create_safely_typed_any(bool&& value)
@@ -197,4 +197,4 @@ temp_safely_cast_any_dictionary_any(std::any const& a)
     return const_cast<AnyDictionary&>(std::any_cast<AnyDictionary const&>(a));
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/safely_typed_any.h b/src/opentimelineio/safely_typed_any.h
index 22398a7e8b..f9586b96b0 100644
--- a/src/opentimelineio/safely_typed_any.h
+++ b/src/opentimelineio/safely_typed_any.h
@@ -26,7 +26,7 @@
 #include "opentimelineio/serializableObject.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @name Any Create
 ///@{
@@ -76,4 +76,4 @@ AnyVector&     temp_safely_cast_any_vector_any(std::any const& a);
 
 ///@}
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serializableCollection.cpp b/src/opentimelineio/serializableCollection.cpp
index 431afb2383..2ab684cbef 100644
--- a/src/opentimelineio/serializableCollection.cpp
+++ b/src/opentimelineio/serializableCollection.cpp
@@ -5,7 +5,7 @@
 #include "opentimelineio/clip.h"
 #include "opentimelineio/vectorIndexing.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 SerializableCollection::SerializableCollection(
     std::string const&               name,
@@ -113,4 +113,4 @@ SerializableCollection::find_clips(
     return find_children<Clip>(error_status, search_range, shallow_search);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serializableCollection.h b/src/opentimelineio/serializableCollection.h
index 71d8a104b4..cf2d0087fd 100644
--- a/src/opentimelineio/serializableCollection.h
+++ b/src/opentimelineio/serializableCollection.h
@@ -8,7 +8,7 @@
 #include "opentimelineio/timeline.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Clip;
 
@@ -178,4 +178,4 @@ SerializableCollection::find_children(
     return out;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serializableObject.cpp b/src/opentimelineio/serializableObject.cpp
index e7872b1c38..d2f860c753 100644
--- a/src/opentimelineio/serializableObject.cpp
+++ b/src/opentimelineio/serializableObject.cpp
@@ -7,7 +7,7 @@
 #include "stringUtils.h"
 #include "typeRegistry.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 SerializableObject::SerializableObject()
     : _cached_type_record(nullptr)
@@ -267,4 +267,4 @@ SerializableObject::current_ref_count() const
     return _managed_ref_count;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serializableObject.h b/src/opentimelineio/serializableObject.h
index 26269af670..118e686fd6 100644
--- a/src/opentimelineio/serializableObject.h
+++ b/src/opentimelineio/serializableObject.h
@@ -20,7 +20,7 @@
 #include <optional>
 #include <unordered_map>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class CloningEncoder;
 
@@ -738,4 +738,4 @@ dynamic_retainer_cast(SerializableObject::Retainer<U> const& retainer)
     return dynamic_cast<T*>(retainer.value);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serializableObjectWithMetadata.cpp b/src/opentimelineio/serializableObjectWithMetadata.cpp
index d08d3b0815..5882df34e4 100644
--- a/src/opentimelineio/serializableObjectWithMetadata.cpp
+++ b/src/opentimelineio/serializableObjectWithMetadata.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/serializableObjectWithMetadata.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 SerializableObjectWithMetadata::SerializableObjectWithMetadata(
     std::string const&   name,
@@ -31,4 +31,4 @@ SerializableObjectWithMetadata::write_to(Writer& writer) const
     writer.write("name", _name);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serializableObjectWithMetadata.h b/src/opentimelineio/serializableObjectWithMetadata.h
index 959db20fa6..4eeac3f5e1 100644
--- a/src/opentimelineio/serializableObjectWithMetadata.h
+++ b/src/opentimelineio/serializableObjectWithMetadata.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/serializableObject.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief A serializable object with metadata.
 class OTIO_API_TYPE SerializableObjectWithMetadata : public SerializableObject
@@ -52,4 +52,4 @@ class OTIO_API_TYPE SerializableObjectWithMetadata : public SerializableObject
     AnyDictionary _metadata;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serialization.cpp b/src/opentimelineio/serialization.cpp
index 71cfd48cbd..bb6e57d1d1 100644
--- a/src/opentimelineio/serialization.cpp
+++ b/src/opentimelineio/serialization.cpp
@@ -29,7 +29,7 @@
 #    include <windows.h>
 #endif
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /**
  * Base class for encoders.  Since rapidjson is templated (no virtual functions)
@@ -1450,4 +1450,4 @@ SerializableObject::Writer::~Writer()
     }
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/serialization.h b/src/opentimelineio/serialization.h
index af9258e262..026333c026 100644
--- a/src/opentimelineio/serialization.h
+++ b/src/opentimelineio/serialization.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Serialize JSON data to a string.
 OTIO_API std::string serialize_json_to_string(
@@ -28,4 +28,4 @@ OTIO_API bool serialize_json_to_file(
     ErrorStatus*              error_status           = nullptr,
     int                       indent                 = 4);
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/stack.cpp b/src/opentimelineio/stack.cpp
index b6d58a1864..017f251953 100644
--- a/src/opentimelineio/stack.cpp
+++ b/src/opentimelineio/stack.cpp
@@ -5,7 +5,7 @@
 #include "opentimelineio/clip.h"
 #include "opentimelineio/vectorIndexing.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Stack::Stack(
     std::string const&              name,
@@ -165,4 +165,4 @@ Stack::available_image_bounds(ErrorStatus* error_status) const
     return box;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/stack.h b/src/opentimelineio/stack.h
index 289d44843c..26a0f6748a 100644
--- a/src/opentimelineio/stack.h
+++ b/src/opentimelineio/stack.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/composition.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Clip;
 
@@ -67,4 +67,4 @@ class OTIO_API_TYPE Stack : public Composition
     void write_to(Writer&) const override;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/stackAlgorithm.cpp b/src/opentimelineio/stackAlgorithm.cpp
index c8b60abbb4..6919f6f6ea 100644
--- a/src/opentimelineio/stackAlgorithm.cpp
+++ b/src/opentimelineio/stackAlgorithm.cpp
@@ -7,7 +7,7 @@
 #include "opentimelineio/trackAlgorithm.h"
 #include "opentimelineio/transition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 typedef std::map<Track*, std::map<Composable*, TimeRange>> RangeTrackMap;
 typedef std::vector<SerializableObject::Retainer<Track>>   TrackRetainerVector;
@@ -256,4 +256,4 @@ flatten_stack(std::vector<Track*> const& tracks, ErrorStatus* error_status)
         error_status);
     return flat_track;
 }
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/stackAlgorithm.h b/src/opentimelineio/stackAlgorithm.h
index 8f37ec9a4b..230bc7ed23 100644
--- a/src/opentimelineio/stackAlgorithm.h
+++ b/src/opentimelineio/stackAlgorithm.h
@@ -7,7 +7,7 @@
 #include "opentimelineio/track.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Flatten a stack down to a single track.
 OTIO_API Track*
@@ -18,4 +18,4 @@ OTIO_API Track* flatten_stack(
     std::vector<Track*> const& tracks,
     ErrorStatus*               error_status = nullptr);
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/stringUtils.cpp b/src/opentimelineio/stringUtils.cpp
index 3ecd47bc1d..20ac2c2ce2 100644
--- a/src/opentimelineio/stringUtils.cpp
+++ b/src/opentimelineio/stringUtils.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <typeinfo>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 std::string
 type_name_for_error_message(std::type_info const& t)
@@ -66,4 +66,4 @@ split_schema_string(
     }
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/stringUtils.h b/src/opentimelineio/stringUtils.h
index 10a7313c03..709b5c1b81 100644
--- a/src/opentimelineio/stringUtils.h
+++ b/src/opentimelineio/stringUtils.h
@@ -10,7 +10,7 @@ using opentime::string_printf;
 #include <any>
 #include <string>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @name String Utilities
 ///@{
@@ -35,4 +35,4 @@ bool split_schema_string(
 
 ///@}
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/timeEffect.cpp b/src/opentimelineio/timeEffect.cpp
index 4e9d65a60f..f2a4279590 100644
--- a/src/opentimelineio/timeEffect.cpp
+++ b/src/opentimelineio/timeEffect.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/timeEffect.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 TimeEffect::TimeEffect(
     std::string const&   name,
@@ -15,4 +15,4 @@ TimeEffect::TimeEffect(
 TimeEffect::~TimeEffect()
 {}
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/timeEffect.h b/src/opentimelineio/timeEffect.h
index a8a920cf01..82d2af6217 100644
--- a/src/opentimelineio/timeEffect.h
+++ b/src/opentimelineio/timeEffect.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/effect.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Base class for all effects that alter the timing of an item.
 class OTIO_API_TYPE TimeEffect : public Effect
@@ -35,4 +35,4 @@ class OTIO_API_TYPE TimeEffect : public Effect
     virtual ~TimeEffect();
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/timeline.cpp b/src/opentimelineio/timeline.cpp
index d2f38571e8..32c074e512 100644
--- a/src/opentimelineio/timeline.cpp
+++ b/src/opentimelineio/timeline.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/timeline.h"
 #include "opentimelineio/clip.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Timeline::Timeline(
     std::string const&          name,
@@ -86,4 +86,4 @@ Timeline::find_clips(
         shallow_search);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/timeline.h b/src/opentimelineio/timeline.h
index 7983137795..9273ad5bf9 100644
--- a/src/opentimelineio/timeline.h
+++ b/src/opentimelineio/timeline.h
@@ -8,7 +8,7 @@
 #include "opentimelineio/track.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Clip;
 
@@ -133,4 +133,4 @@ Timeline::find_children(
         shallow_search);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/track.cpp b/src/opentimelineio/track.cpp
index b104f5d4a3..2da7514e60 100644
--- a/src/opentimelineio/track.cpp
+++ b/src/opentimelineio/track.cpp
@@ -7,7 +7,7 @@
 #include "opentimelineio/transition.h"
 #include "opentimelineio/vectorIndexing.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Track::Track(
     std::string const&              name,
@@ -303,4 +303,4 @@ Track::available_image_bounds(ErrorStatus* error_status) const
     return box;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/track.h b/src/opentimelineio/track.h
index 2d8e5f9528..aa52983e8f 100644
--- a/src/opentimelineio/track.h
+++ b/src/opentimelineio/track.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/composition.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class Clip;
 
@@ -94,4 +94,4 @@ class OTIO_API_TYPE Track : public Composition
     std::string _kind;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/trackAlgorithm.cpp b/src/opentimelineio/trackAlgorithm.cpp
index 4b6e6e5bea..0bc9970c71 100644
--- a/src/opentimelineio/trackAlgorithm.cpp
+++ b/src/opentimelineio/trackAlgorithm.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/trackAlgorithm.h"
 #include "opentimelineio/transition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Track*
 track_trimmed_to_range(
@@ -109,4 +109,4 @@ track_trimmed_to_range(
     return new_track;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/trackAlgorithm.h b/src/opentimelineio/trackAlgorithm.h
index 19a8a0487a..112827630e 100644
--- a/src/opentimelineio/trackAlgorithm.h
+++ b/src/opentimelineio/trackAlgorithm.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/track.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Trim the track to the given range.
 OTIO_API Track* track_trimmed_to_range(
@@ -14,4 +14,4 @@ OTIO_API Track* track_trimmed_to_range(
     TimeRange    trim_range,
     ErrorStatus* error_status = nullptr);
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/transition.cpp b/src/opentimelineio/transition.cpp
index d64010f5ec..8a41c50966 100644
--- a/src/opentimelineio/transition.cpp
+++ b/src/opentimelineio/transition.cpp
@@ -4,7 +4,7 @@
 #include "opentimelineio/transition.h"
 #include "opentimelineio/composition.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 Transition::Transition(
     std::string const&   name,
@@ -85,4 +85,4 @@ Transition::trimmed_range_in_parent(ErrorStatus* error_status) const
     return parent()->trimmed_range_of_child(this, error_status);
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/transition.h b/src/opentimelineio/transition.h
index df6e3e1700..c5c5d52fb2 100644
--- a/src/opentimelineio/transition.h
+++ b/src/opentimelineio/transition.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/composable.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 /// @brief Represents a transition between the two adjacent items in a Track.
 ///
 /// For example, a cross dissolve or wipe.
@@ -93,4 +93,4 @@ class OTIO_API_TYPE Transition : public Composable
     RationalTime _in_offset, _out_offset;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/typeRegistry.cpp b/src/opentimelineio/typeRegistry.cpp
index 7254079496..8e4f012f2e 100644
--- a/src/opentimelineio/typeRegistry.cpp
+++ b/src/opentimelineio/typeRegistry.cpp
@@ -32,7 +32,7 @@
 #include <assert.h>
 #include <vector>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 TypeRegistry&
 TypeRegistry::TypeRegistry::instance()
@@ -397,4 +397,4 @@ TypeRegistry::type_version_map(schema_version_map& result)
     }
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/typeRegistry.h b/src/opentimelineio/typeRegistry.h
index 635e203ce2..2f9182ac94 100644
--- a/src/opentimelineio/typeRegistry.h
+++ b/src/opentimelineio/typeRegistry.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 class SerializableObject;
 class Encoder;
@@ -224,4 +224,4 @@ class OTIO_API_TYPE TypeRegistry
     friend class CloningEncoder;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/unknownSchema.cpp b/src/opentimelineio/unknownSchema.cpp
index 5ee35bda29..d9e9309aab 100644
--- a/src/opentimelineio/unknownSchema.cpp
+++ b/src/opentimelineio/unknownSchema.cpp
@@ -3,7 +3,7 @@
 
 #include "opentimelineio/unknownSchema.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 UnknownSchema::UnknownSchema(
     std::string const& original_schema_name,
@@ -44,4 +44,4 @@ UnknownSchema::is_unknown_schema() const
     return true;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/unknownSchema.h b/src/opentimelineio/unknownSchema.h
index cab5756042..0d13538b93 100644
--- a/src/opentimelineio/unknownSchema.h
+++ b/src/opentimelineio/unknownSchema.h
@@ -6,7 +6,7 @@
 #include "opentimelineio/serializableObject.h"
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief An unknown schema.
 class OTIO_API_TYPE UnknownSchema : public SerializableObject
@@ -59,4 +59,4 @@ class OTIO_API_TYPE UnknownSchema : public SerializableObject
     friend class SerializableObject::Writer;
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/vectorIndexing.h b/src/opentimelineio/vectorIndexing.h
index bffbbdaac9..3529ada673 100644
--- a/src/opentimelineio/vectorIndexing.h
+++ b/src/opentimelineio/vectorIndexing.h
@@ -5,7 +5,7 @@
 
 #include "opentimelineio/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 /// @brief Return the adjusted vector index.
 template <typename V>
@@ -15,4 +15,4 @@ adjusted_vector_index(int index, V const& vec) noexcept
     return index < 0 ? int(vec.size()) + index : index;
 }
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/opentimelineio/version.h.in b/src/opentimelineio/version.h.in
index cb69297e22..27b07dcae9 100644
--- a/src/opentimelineio/version.h.in
+++ b/src/opentimelineio/version.h.in
@@ -7,17 +7,18 @@
 #define OPENTIMELINEIO_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define OPENTIMELINEIO_VERSION_PATCH @PROJECT_VERSION_PATCH@
 #define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@
+#define OPENTIMELINEIO_VERSION_NS v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@
 
 #include "opentime/rationalTime.h"
 #include "opentime/timeRange.h"
 #include "opentime/timeTransform.h"
 #include "opentime/version.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 using opentime::RationalTime;
 using opentime::TimeRange;
 using opentime::TimeTransform;
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS
 
 /// @brief Convenience macro for the full namespace of OpenTimelineIO API.
 ///
@@ -26,4 +27,4 @@ using opentime::TimeTransform;
 ///     OTIO_NS::Track* track = new OTIO_NS::Track;
 /// </code>
 ///
-#define OTIO_NS opentimelineio::OPENTIMELINEIO_VERSION
+#define OTIO_NS opentimelineio::OPENTIMELINEIO_VERSION_NS
diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h b/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h
index 882ad8bf0a..bf1ea198b7 100644
--- a/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h
+++ b/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h
@@ -6,7 +6,7 @@
 #include <pybind11/pybind11.h>
 #include "opentimelineio/errorStatus.h"
 
-using namespace opentimelineio::OPENTIMELINEIO_VERSION;
+using namespace opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 struct ErrorStatusHandler {
     operator ErrorStatus* () {
diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h
index 889df128b2..b51fc9ac56 100644
--- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h
+++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h
@@ -11,7 +11,7 @@
 #include "opentimelineio/vectorIndexing.h"
 #include "opentimelineio/safely_typed_any.h"
 
-using namespace opentimelineio::OPENTIMELINEIO_VERSION;
+using namespace opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 void install_external_keepalive_monitor(SerializableObject* so, bool apply_now);
 
diff --git a/tests/test_clip.cpp b/tests/test_clip.cpp
index cfae000516..4a1d7f3ed8 100644
--- a/tests/test_clip.cpp
+++ b/tests/test_clip.cpp
@@ -15,8 +15,8 @@
 
 #include <iostream>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_composition.cpp b/tests/test_composition.cpp
index 7c6562b8ec..4fa924412d 100644
--- a/tests/test_composition.cpp
+++ b/tests/test_composition.cpp
@@ -12,8 +12,8 @@
 
 #include <iostream>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_editAlgorithm.cpp b/tests/test_editAlgorithm.cpp
index 7abbb97582..03e136ed46 100644
--- a/tests/test_editAlgorithm.cpp
+++ b/tests/test_editAlgorithm.cpp
@@ -16,8 +16,8 @@
 #define DEBUG
 
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 using otime::RationalTime;
 using otime::TimeRange;
diff --git a/tests/test_opentime.cpp b/tests/test_opentime.cpp
index 3272a796e5..7364202803 100644
--- a/tests/test_opentime.cpp
+++ b/tests/test_opentime.cpp
@@ -6,7 +6,7 @@
 #include <opentime/rationalTime.h>
 #include <opentime/timeRange.h>
 
-namespace otime = opentime::OPENTIME_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_serializableCollection.cpp b/tests/test_serializableCollection.cpp
index b4ad9ff739..8598278232 100644
--- a/tests/test_serializableCollection.cpp
+++ b/tests/test_serializableCollection.cpp
@@ -10,8 +10,8 @@
 
 #include <iostream>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_serialization.cpp b/tests/test_serialization.cpp
index e67ea09a6b..3923eba492 100644
--- a/tests/test_serialization.cpp
+++ b/tests/test_serialization.cpp
@@ -14,8 +14,8 @@
 #include <iostream>
 #include <string>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_stack_algo.cpp b/tests/test_stack_algo.cpp
index 39a953d73c..c064ee62b8 100644
--- a/tests/test_stack_algo.cpp
+++ b/tests/test_stack_algo.cpp
@@ -11,8 +11,8 @@
 
 #include <iostream>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_timeline.cpp b/tests/test_timeline.cpp
index 8887c58892..9644476cdf 100644
--- a/tests/test_timeline.cpp
+++ b/tests/test_timeline.cpp
@@ -9,8 +9,8 @@
 
 #include <iostream>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)
diff --git a/tests/test_track.cpp b/tests/test_track.cpp
index d58e67901e..3d4a48035e 100644
--- a/tests/test_track.cpp
+++ b/tests/test_track.cpp
@@ -9,8 +9,8 @@
 
 #include <iostream>
 
-namespace otime = opentime::OPENTIME_VERSION;
-namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+namespace otime = opentime::OPENTIME_VERSION_NS;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION_NS;
 
 int
 main(int argc, char** argv)

From 63883e1aa6b3ff25e8f74cb009446af64134603f Mon Sep 17 00:00:00 2001
From: Darby Johnston <darbyjohnston@yahoo.com>
Date: Tue, 11 Nov 2025 10:06:52 -0800
Subject: [PATCH 2/2] Update version map

Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
---
 src/opentimelineio/CORE_VERSION_MAP.last.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opentimelineio/CORE_VERSION_MAP.last.cpp b/src/opentimelineio/CORE_VERSION_MAP.last.cpp
index 2b7eb8d0e4..43a32f37f5 100644
--- a/src/opentimelineio/CORE_VERSION_MAP.last.cpp
+++ b/src/opentimelineio/CORE_VERSION_MAP.last.cpp
@@ -12,7 +12,7 @@
 // version of an older library.
 #include "opentimelineio/typeRegistry.h"
 
-namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
+namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
 
 const label_to_schema_version_map CORE_VERSION_MAP{
     { "0.14.0",
@@ -209,4 +209,4 @@ const label_to_schema_version_map CORE_VERSION_MAP{
     // {next}
 };
 
-}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
+}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS