diff --git a/iOS/Canvas/Canvas/GL/BlurEffect.cpp b/iOS/Canvas/Canvas/GL/BlurEffect.cpp
index adfe86dc8..33ec7e968 100644
--- a/iOS/Canvas/Canvas/GL/BlurEffect.cpp
+++ b/iOS/Canvas/Canvas/GL/BlurEffect.cpp
@@ -16,7 +16,7 @@ using namespace fiftythree;
 using namespace canvas;
 using namespace common;
 
-void GLBlurEffect::SetTextures(const GLBlurEffectTextures & tex)
+void BlurEffect::SetTextures(const BlurEffectTextures & tex)
 {
     _BlurFBO = tex.BlurFBO;
     _BlurTexture0 = tex.BlurTexture0;
@@ -24,7 +24,7 @@ void GLBlurEffect::SetTextures(const GLBlurEffectTextures & tex)
     _OutputTexture = tex.OutputTexture;
 }
 
-void GLBlurEffect::ClearBlur(GLESState & state)
+void BlurEffect::ClearBlur(GLESState & state)
 {
     DebugGLGroupMarkerScopeGuard("Clear Blur");
 
@@ -44,7 +44,7 @@ void GLBlurEffect::ClearBlur(GLESState & state)
     state.PopFramebuffer();
 }
 
-void GLBlurEffect::RenderEffect(const Renderer::Ptr & renderer)
+void BlurEffect::RenderEffect(const Renderer::Ptr & renderer)
 {
     DebugGLGroupMarkerScopeGuard("Blur Output");
 
diff --git a/iOS/Canvas/Canvas/GL/BlurEffect.h b/iOS/Canvas/Canvas/GL/BlurEffect.h
index 64b8cbafe..261931bda 100644
--- a/iOS/Canvas/Canvas/GL/BlurEffect.h
+++ b/iOS/Canvas/Canvas/GL/BlurEffect.h
@@ -15,7 +15,7 @@ namespace fiftythree
 namespace canvas
 {
 
-struct GLBlurEffectTextures
+struct BlurEffectTextures
 {
     FramebufferObject::Ptr BlurFBO;
     Texture::Ptr           BlurTexture0;
@@ -24,7 +24,7 @@ struct GLBlurEffectTextures
     Texture::Ptr           OutputTexture;
 };
 
-class GLBlurEffect : public GLEffect
+class BlurEffect : public Effect
 {
     FramebufferObject::Ptr _BlurFBO;
     Texture::Ptr           _BlurTexture0;
@@ -37,11 +37,11 @@ class GLBlurEffect : public GLEffect
     void ClearBlur(GLESState & state);
 
 public:
-    GLBlurEffect() : _ClearColor(0.0f,0.0f,0.0f,0.0f) {}
+    BlurEffect() : _ClearColor(0.0f,0.0f,0.0f,0.0f) {}
 
     virtual void RenderEffect(const Renderer::Ptr & renderer);
 
-    void SetTextures(const GLBlurEffectTextures & tex);
+    void SetTextures(const BlurEffectTextures & tex);
 };
 
 }
diff --git a/iOS/Canvas/Canvas/GL/Effect.h b/iOS/Canvas/Canvas/GL/Effect.h
index b10d5e93d..6e57bb367 100644
--- a/iOS/Canvas/Canvas/GL/Effect.h
+++ b/iOS/Canvas/Canvas/GL/Effect.h
@@ -14,7 +14,7 @@ namespace fiftythree
 namespace canvas
 {
 
-class GLEffect
+class Effect
 {
 public:
     virtual void RenderEffect(const Renderer::Ptr & renderer) = 0;
diff --git a/iOS/Canvas/Canvas/GL/GLCompositor.cpp b/iOS/Canvas/Canvas/GL/GLCompositor.cpp
index 43fb30228..faed8c985 100644
--- a/iOS/Canvas/Canvas/GL/GLCompositor.cpp
+++ b/iOS/Canvas/Canvas/GL/GLCompositor.cpp
@@ -870,7 +870,7 @@ class GLCompositorImpl : public GLCompositor
     FramebufferObject::Ptr _BlurFBO;
     Texture::Ptr           _BlurTexture0;
     Texture::Ptr           _BlurTexture1;
-    GLBlurEffect           _BlurEffect;
+    BlurEffect             _BlurEffect;
 
     Eigen::Affine3f        _ToScreenTransform;
 
@@ -1006,7 +1006,7 @@ class GLCompositorImpl : public GLCompositor
         _OutputTexture->SetTextureSampling(TextureSampling::Nearest);
     }
 
-    // Lazily initialize buffers dependent on
+    // Lazily initialize buffers dependent on brush type
     void EnsureLazyAllocatedBuffers(const Renderer::Ptr & renderer, const StrokeRenderable::Ptr & r)
     {
         size_t bufferWidth = round(_Bounds.Width * _Bounds.Scale);
@@ -1032,7 +1032,7 @@ class GLCompositorImpl : public GLCompositor
                 _BlurFBO = FramebufferObject::New();
                 _BlurFBO->Initialize();
 
-                GLBlurEffectTextures blurTextures;
+                BlurEffectTextures blurTextures;
                 blurTextures.BlurTexture0 = _BlurTexture0;
                 blurTextures.BlurTexture1 = _BlurTexture1;
                 blurTextures.BlurFBO = _BlurFBO;