diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index 82e1b04c..5107ffd9 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -4764,10 +4764,9 @@
 	(check-callback cwho paint-callback)
 	(check-label-string/false cwho label)))
     (public
-      [swap-gl-buffers (lambda () (send (send (send wx get-dc) get-gl) swap-buffers))]
+      [swap-gl-buffers (lambda () (send (send (send wx get-dc) get-gl-context) swap-buffers))]
       [with-gl-context (lambda (thunk) 
-			 (parameterize ([wx:current-gl-context (send (send wx get-dc) get-gl)])
-			   (thunk)))]
+			 (send (send (send wx get-dc) get-gl-context) call-as-current thunk))]
       [accept-tab-focus (entry-point
 			 (case-lambda
 			  [() (send wx get-tab-focus)]
@@ -7641,7 +7640,8 @@
 	   yield
 	   eventspace-shutdown?
 	   get-panel-background
-	   send-event)
+	   send-event
+	   gl-context<%>)
 
 (define the-color-database (wx:get-the-color-database))
 (define the-font-name-directory (wx:get-the-font-name-directory))
diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss
index aaf7c954..326639d2 100644
--- a/collects/mred/private/kernel.ss
+++ b/collects/mred/private/kernel.ss
@@ -361,7 +361,7 @@
     start-page
     start-doc
     ok?
-    get-gl
+    get-gl-context
     get-size
     get-text-foreground
     get-text-background
@@ -410,9 +410,8 @@
     get-pixel)
   (define-class post-script-dc% dc% ([interactive? #t] [parent #f] [use-paper-bbox? #f]))
   (define-class printer-dc% dc% ([parent #f]))
-  (define-private-class gl% gl<%> object% #f
-    with-context
-    set-as-context
+  (define-private-class gl-context% gl-context<%> object% #f
+    call-as-current
     swap-buffers
     ok?)
   (define-class event% object% ([time-stamp 0])
@@ -1458,7 +1457,6 @@
     location->window
     set-dialogs
     set-executer
-    current-gl-context
     send-event
     file-creator-and-type
     set-snip-class-getter