diff --git a/Runtime/Graphics/CGraphics.cpp b/Runtime/Graphics/CGraphics.cpp
index 03880000e..59c6dd10e 100644
--- a/Runtime/Graphics/CGraphics.cpp
+++ b/Runtime/Graphics/CGraphics.cpp
@@ -191,7 +191,7 @@ zeus::CMatrix4f CGraphics::CalculatePerspectiveMatrix(float fovy, float aspect,
 
     switch (g_BooPlatform)
     {
-    case boo::IGraphicsDataFactory::Platform::OGL:
+    case boo::IGraphicsDataFactory::Platform::OpenGL:
     default:
     {
         return zeus::CMatrix4f(2.f * st.x14_near / rml, 0.f, rpl / rml, 0.f,
@@ -239,7 +239,7 @@ zeus::CMatrix4f CGraphics::GetPerspectiveProjectionMatrix(bool forRenderer)
 
     switch (g_BooPlatform)
     {
-    case boo::IGraphicsDataFactory::Platform::OGL:
+    case boo::IGraphicsDataFactory::Platform::OpenGL:
     default:
     {
         return zeus::CMatrix4f(2.f * g_Proj.x14_near / rml, 0.f, rpl / rml, 0.f,
diff --git a/Runtime/Graphics/CMakeLists.txt b/Runtime/Graphics/CMakeLists.txt
index 16ea05024..1564bcc21 100644
--- a/Runtime/Graphics/CMakeLists.txt
+++ b/Runtime/Graphics/CMakeLists.txt
@@ -9,7 +9,7 @@ if(WIN32)
       Shaders/CSpaceWarpFilterHLSL.cpp
       Shaders/CCameraBlurFilterHLSL.cpp
       Shaders/CXRayBlurFilterHLSL.cpp)
-elseif(APPLE)
+elseif(BOO_HAS_METAL)
   set(PLAT_SRCS
       Shaders/CLineRendererShadersMetal.cpp
       Shaders/CTexturedQuadFilterMetal.cpp
diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp
index c478189f5..82dd739fa 100644
--- a/Runtime/Graphics/CMoviePlayer.cpp
+++ b/Runtime/Graphics/CMoviePlayer.cpp
@@ -210,7 +210,7 @@ void CMoviePlayer::Initialize()
 
         switch (ctx.platform())
         {
-        case boo::IGraphicsDataFactory::Platform::OGL:
+        case boo::IGraphicsDataFactory::Platform::OpenGL:
             YUVShaderPipeline = static_cast<boo::GLDataFactory::Context&>(ctx).newShaderPipeline
                     (VS_GLSL_YUV, FS_GLSL_YUV, 3, TexNames, 1, BlockNames,
                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
diff --git a/Runtime/Graphics/Shaders/CLineRendererShaders.cpp b/Runtime/Graphics/Shaders/CLineRendererShaders.cpp
index 756d74b2b..4194af9b6 100644
--- a/Runtime/Graphics/Shaders/CLineRendererShaders.cpp
+++ b/Runtime/Graphics/Shaders/CLineRendererShaders.cpp
@@ -25,7 +25,7 @@ void CLineRendererShaders::Initialize()
     {
         switch (ctx.platform())
         {
-        case boo::IGraphicsDataFactory::Platform::OGL:
+        case boo::IGraphicsDataFactory::Platform::OpenGL:
             m_bindFactory.reset(Initialize(static_cast<boo::GLDataFactory::Context&>(ctx)));
             break;
 #if _WIN32
diff --git a/Runtime/Graphics/Shaders/CModelShaders.cpp b/Runtime/Graphics/Shaders/CModelShaders.cpp
index c00246cef..62612045a 100644
--- a/Runtime/Graphics/Shaders/CModelShaders.cpp
+++ b/Runtime/Graphics/Shaders/CModelShaders.cpp
@@ -10,7 +10,7 @@ CModelShaders::GetShaderExtensions(boo::IGraphicsDataFactory::Platform plat)
 {
     switch (plat)
     {
-    case boo::IGraphicsDataFactory::Platform::OGL:
+    case boo::IGraphicsDataFactory::Platform::OpenGL:
     case boo::IGraphicsDataFactory::Platform::Vulkan:
         return GetShaderExtensionsGLSL(plat);
 #if _WIN32
diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp b/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp
index 946133946..aea3661f9 100644
--- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp
+++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp
@@ -118,7 +118,7 @@ void CSpaceWarpFilter::draw(const zeus::CVector3f& pt)
     m_uniform.m_matrix[1][1] = clipRect.x10_height / vp.y;
     m_uniform.m_matrix[3][0] = pt.x + (1.f / vp.x);
     m_uniform.m_matrix[3][1] = pt.y + (1.f / vp.y);
-    if (CGraphics::g_BooPlatform == boo::IGraphicsDataFactory::Platform::OGL)
+    if (CGraphics::g_BooPlatform == boo::IGraphicsDataFactory::Platform::OpenGL)
         m_uniform.m_matrix[3][2] = pt.z * 2.f - 1.f;
     else
         m_uniform.m_matrix[3][2] = pt.z;
diff --git a/Runtime/Graphics/Shaders/TMultiBlendShader.hpp b/Runtime/Graphics/Shaders/TMultiBlendShader.hpp
index 74e46e91e..85dcf6a83 100644
--- a/Runtime/Graphics/Shaders/TMultiBlendShader.hpp
+++ b/Runtime/Graphics/Shaders/TMultiBlendShader.hpp
@@ -41,7 +41,7 @@ public:
         {
             switch (ctx.platform())
             {
-            case boo::IGraphicsDataFactory::Platform::OGL:
+            case boo::IGraphicsDataFactory::Platform::OpenGL:
                 m_bindFactory.reset(FilterImp::Initialize(static_cast<boo::GLDataFactory::Context&>(ctx),
                                                           m_alphaBlendPipeline, m_additiveAlphaPipeline, m_colorMultiplyPipeline));
                 break;
diff --git a/Runtime/Graphics/Shaders/TShader.hpp b/Runtime/Graphics/Shaders/TShader.hpp
index a6463de3c..24389fe8d 100644
--- a/Runtime/Graphics/Shaders/TShader.hpp
+++ b/Runtime/Graphics/Shaders/TShader.hpp
@@ -38,7 +38,7 @@ public:
         {
             switch (ctx.platform())
             {
-            case boo::IGraphicsDataFactory::Platform::OGL:
+            case boo::IGraphicsDataFactory::Platform::OpenGL:
                 m_bindFactory.reset(FilterImp::Initialize(static_cast<boo::GLDataFactory::Context&>(ctx),
                                                           m_pipeline));
                 break;
diff --git a/Runtime/Particle/CElementGen.cpp b/Runtime/Particle/CElementGen.cpp
index 27a82cc84..fd504d7dd 100644
--- a/Runtime/Particle/CElementGen.cpp
+++ b/Runtime/Particle/CElementGen.cpp
@@ -180,7 +180,7 @@ void CElementGenShaders::Initialize()
     {
         switch (ctx.platform())
         {
-        case boo::IGraphicsDataFactory::Platform::OGL:
+        case boo::IGraphicsDataFactory::Platform::OpenGL:
             m_bindFactory.reset(Initialize(static_cast<boo::GLDataFactory::Context&>(ctx)));
             break;
 #if _WIN32
diff --git a/Runtime/Particle/CMakeLists.txt b/Runtime/Particle/CMakeLists.txt
index cb8bfd89d..48497f398 100644
--- a/Runtime/Particle/CMakeLists.txt
+++ b/Runtime/Particle/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(WIN32)
   set(PLAT_SRCS CElementGenShadersHLSL.cpp)
-elseif(APPLE)
+elseif(BOO_HAS_METAL)
   set(PLAT_SRCS CElementGenShadersMetal.cpp)
 endif()
 
diff --git a/hecl b/hecl
index 9b9dae615..0753c01b3 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 9b9dae61566460086a51ccf371fc1bdf682ee5cb
+Subproject commit 0753c01b3c6a0a8db4b390cdc4553e5c047525c9
diff --git a/specter b/specter
index 4c675e2e0..948602e8c 160000
--- a/specter
+++ b/specter
@@ -1 +1 @@
-Subproject commit 4c675e2e0512c911b76da84b0073396392c7f3a3
+Subproject commit 948602e8c5852e70d6598e09b603983c91fb07ca