2 files changed, 11 insertions, 7 deletions

diff --git a/lc/Builtins.lc b/lc/Builtins.lc
index 96a313d2..9150691d 100644
--- a/lc/Builtins.lc
+++ b/lc/Builtins.lc
@@ -574,10 +574,14 @@ texture2D :: Sampler -> Vec 2 Float -> Vec 4 Float
 
 rasterize = Rasterize
 filterFragmentStream = FilteredFragmentStream
-fragmentShaderRastDepth f = Fragments (FragmentShaderRastDepth f)
+transformFragmentsRastDepth f = Fragments (FragmentShaderRastDepth f)
 accumulateWith ctx x = (ctx, x)
 overlay cl (ctx, str) = Accumulate ctx str cl
 transformVertices f s =  Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
+renderFrame = ScreenOut
+imageFrame = FrameBuffer
+emptyDepthImage = DepthImage @1
+emptyColorImage = ColorImage @1
 
 infixl 0 `overlay`
 
diff --git a/testdata/accept/helloWorld.lc b/testdata/accept/helloWorld.lc
index e8f599cc..f99d3088 100644
--- a/testdata/accept/helloWorld.lc
+++ b/testdata/accept/helloWorld.lc
@@ -1,17 +1,17 @@
 
-pipeline (projmat :: Mat 4 4 Float)
-         (vertexstream :: VertexStream Triangle (Vec 4 Float))
+makeFrame (projmat :: Mat 4 4 Float)
+          (vertexstream :: VertexStream Triangle (Vec 4 Float))
 
-    = FrameBuffer (DepthImage @1 1000, ColorImage @1 navy)
+    = imageFrame (emptyDepthImage 1000, emptyColorImage navy)
   `overlay`
       vertexstream
     & transformVertices (scale 0.5 . (projmat *.))
     & rasterize (TriangleCtx CullNone PolygonFill NoOffset LastVertex)
     & filterFragmentStream PassAll
-    & fragmentShaderRastDepth (\x -> x)
+    & transformFragmentsRastDepth (\x -> x)
     & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
 
-main = ScreenOut $
-    pipeline (Uniform "MVP")
+main = renderFrame $
+   makeFrame (Uniform "MVP")
              (Fetch "stream4" (Attribute "position4"))