diff --git a/examples/ircd/channel.rkt b/examples/ircd/channel.rkt
index 6b56119..e6e38f3 100644
--- a/examples/ircd/channel.rkt
+++ b/examples/ircd/channel.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require "protocol.rkt")
 (require "message.rkt")
diff --git a/examples/ircd/config.rkt b/examples/ircd/config.rkt
index d8a320e..ebc5612 100644
--- a/examples/ircd/config.rkt
+++ b/examples/ircd/config.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/reload)
 (require/activate syndicate/supervise)
diff --git a/examples/ircd/main.rkt b/examples/ircd/main.rkt
index 8e2010b..00a1881 100644
--- a/examples/ircd/main.rkt
+++ b/examples/ircd/main.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/reload)
 
diff --git a/examples/ircd/protocol.rkt b/examples/ircd/protocol.rkt
index 3cd51c4..b419a1f 100644
--- a/examples/ircd/protocol.rkt
+++ b/examples/ircd/protocol.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out ircd-listener)
          (struct-out ircd-motd)
diff --git a/examples/ircd/session.rkt b/examples/ircd/session.rkt
index 4ffde12..f964716 100644
--- a/examples/ircd/session.rkt
+++ b/examples/ircd/session.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/set)
 (require racket/string)
diff --git a/examples/netstack/incremental-highlevel/arp.rkt b/examples/netstack/incremental-highlevel/arp.rkt
index 68ec61a..3e6dfbd 100644
--- a/examples/netstack/incremental-highlevel/arp.rkt
+++ b/examples/netstack/incremental-highlevel/arp.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; ARP protocol, http://tools.ietf.org/html/rfc826
 ;; Only does ARP-over-ethernet.
 
diff --git a/examples/netstack/incremental-highlevel/demo-config.rkt b/examples/netstack/incremental-highlevel/demo-config.rkt
index 33365eb..81d7339 100644
--- a/examples/netstack/incremental-highlevel/demo-config.rkt
+++ b/examples/netstack/incremental-highlevel/demo-config.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstration stack configuration for various hosts.
 
 (require racket/match)
diff --git a/examples/netstack/incremental-highlevel/ethernet.rkt b/examples/netstack/incremental-highlevel/ethernet.rkt
index f731d27..f0841d6 100644
--- a/examples/netstack/incremental-highlevel/ethernet.rkt
+++ b/examples/netstack/incremental-highlevel/ethernet.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Ethernet driver
 
 (provide (struct-out ethernet-packet)
diff --git a/examples/netstack/incremental-highlevel/fetchurl.rkt b/examples/netstack/incremental-highlevel/fetchurl.rkt
index f520146..2b02970 100644
--- a/examples/netstack/incremental-highlevel/fetchurl.rkt
+++ b/examples/netstack/incremental-highlevel/fetchurl.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/drivers/timer)
 (require/activate "ethernet.rkt")
diff --git a/examples/netstack/incremental-highlevel/ip.rkt b/examples/netstack/incremental-highlevel/ip.rkt
index 92b8496..ef41a5b 100644
--- a/examples/netstack/incremental-highlevel/ip.rkt
+++ b/examples/netstack/incremental-highlevel/ip.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out ip-packet)
 	 ip-address->hostname
diff --git a/examples/netstack/incremental-highlevel/main.rkt b/examples/netstack/incremental-highlevel/main.rkt
index be29268..d721f91 100644
--- a/examples/netstack/incremental-highlevel/main.rkt
+++ b/examples/netstack/incremental-highlevel/main.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 
diff --git a/examples/netstack/incremental-highlevel/port-allocator.rkt b/examples/netstack/incremental-highlevel/port-allocator.rkt
index e09ea7c..e1bede8 100644
--- a/examples/netstack/incremental-highlevel/port-allocator.rkt
+++ b/examples/netstack/incremental-highlevel/port-allocator.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; UDP/TCP port allocator
 
 (provide spawn-port-allocator
diff --git a/examples/netstack/incremental-highlevel/tcp.rkt b/examples/netstack/incremental-highlevel/tcp.rkt
index 6f08723..3a78f65 100644
--- a/examples/netstack/incremental-highlevel/tcp.rkt
+++ b/examples/netstack/incremental-highlevel/tcp.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out tcp-address)
 	 (struct-out tcp-handle)
diff --git a/examples/netstack/incremental-highlevel/udp.rkt b/examples/netstack/incremental-highlevel/udp.rkt
index 35fd9a5..380a4bd 100644
--- a/examples/netstack/incremental-highlevel/udp.rkt
+++ b/examples/netstack/incremental-highlevel/udp.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out udp-remote-address)
 	 (struct-out udp-handle)
diff --git a/examples/operational-transformation/syndicate-multiserver.rkt b/examples/operational-transformation/syndicate-multiserver.rkt
index 20b53b6..1a7b545 100644
--- a/examples/operational-transformation/syndicate-multiserver.rkt
+++ b/examples/operational-transformation/syndicate-multiserver.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/file)
 (require racket/serialize)
diff --git a/examples/operational-transformation/syndicate-server.rkt b/examples/operational-transformation/syndicate-server.rkt
index ca16d43..bf05430 100644
--- a/examples/operational-transformation/syndicate-server.rkt
+++ b/examples/operational-transformation/syndicate-server.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/file)
 (require racket/serialize)
diff --git a/examples/platformer/hll-main.rkt b/examples/platformer/hll-main.rkt
index 5f1bfe4..aecbe28 100644
--- a/examples/platformer/hll-main.rkt
+++ b/examples/platformer/hll-main.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require 2htdp/image)
 (require 2htdp/planetcute)
diff --git a/examples/webchat/server/account.rkt b/examples/webchat/server/account.rkt
index 2e26b4e..a19521f 100644
--- a/examples/webchat/server/account.rkt
+++ b/examples/webchat/server/account.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/set)
 
diff --git a/examples/webchat/server/api.rkt b/examples/webchat/server/api.rkt
index 22eb221..2891918 100644
--- a/examples/webchat/server/api.rkt
+++ b/examples/webchat/server/api.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/reload)
 (require/activate syndicate/supervise)
diff --git a/examples/webchat/server/config.rkt b/examples/webchat/server/config.rkt
index 1cd4255..01a40f9 100644
--- a/examples/webchat/server/config.rkt
+++ b/examples/webchat/server/config.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/cmdline)
 (require racket/port)
diff --git a/examples/webchat/server/contacts.rkt b/examples/webchat/server/contacts.rkt
index 0f118d3..284d625 100644
--- a/examples/webchat/server/contacts.rkt
+++ b/examples/webchat/server/contacts.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/reload)
 (require/activate syndicate/supervise)
diff --git a/examples/webchat/server/conversation.rkt b/examples/webchat/server/conversation.rkt
index 3ab2c7e..6f4e278 100644
--- a/examples/webchat/server/conversation.rkt
+++ b/examples/webchat/server/conversation.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/port)
 (require markdown)
diff --git a/examples/webchat/server/duplicate.rkt b/examples/webchat/server/duplicate.rkt
index 36eaec3..9bfa01d 100644
--- a/examples/webchat/server/duplicate.rkt
+++ b/examples/webchat/server/duplicate.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide stop-when-duplicate)
 
diff --git a/examples/webchat/server/main.rkt b/examples/webchat/server/main.rkt
index 3bdb0fe..d0a01b6 100644
--- a/examples/webchat/server/main.rkt
+++ b/examples/webchat/server/main.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/reload)
 
diff --git a/examples/webchat/server/pages.rkt b/examples/webchat/server/pages.rkt
index d6667b7..491b210 100644
--- a/examples/webchat/server/pages.rkt
+++ b/examples/webchat/server/pages.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/dict)
 (require racket/port)
diff --git a/examples/webchat/server/qa.rkt b/examples/webchat/server/qa.rkt
index 866c00c..a75e153 100644
--- a/examples/webchat/server/qa.rkt
+++ b/examples/webchat/server/qa.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide ask-question!)
 
diff --git a/examples/webchat/server/script-compiler.rkt b/examples/webchat/server/script-compiler.rkt
index 625fc76..b70ceaa 100644
--- a/examples/webchat/server/script-compiler.rkt
+++ b/examples/webchat/server/script-compiler.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/file)
 (require racket/port)
diff --git a/examples/webchat/server/static-content.rkt b/examples/webchat/server/static-content.rkt
index 97edc7e..3cf2b74 100644
--- a/examples/webchat/server/static-content.rkt
+++ b/examples/webchat/server/static-content.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/file)
 (require racket/runtime-path)
diff --git a/examples/webchat/server/testdata.rkt b/examples/webchat/server/testdata.rkt
index 1451536..b8302f1 100644
--- a/examples/webchat/server/testdata.rkt
+++ b/examples/webchat/server/testdata.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require "protocol.rkt")
 
diff --git a/examples/webchat/server/trust.rkt b/examples/webchat/server/trust.rkt
index bd7fa02..c07a74d 100644
--- a/examples/webchat/server/trust.rkt
+++ b/examples/webchat/server/trust.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/set)
 
diff --git a/racket/syndicate-gl/examples/basic.rkt b/racket/syndicate-gl/examples/basic.rkt
index 6c8bd2f..e8bb0c8 100644
--- a/racket/syndicate-gl/examples/basic.rkt
+++ b/racket/syndicate-gl/examples/basic.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/set)
 (require 2htdp/image)
diff --git a/racket/syndicate-gl/examples/clock-face.rkt b/racket/syndicate-gl/examples/clock-face.rkt
index 4020e66..42aeb94 100644
--- a/racket/syndicate-gl/examples/clock-face.rkt
+++ b/racket/syndicate-gl/examples/clock-face.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Compare to "ezd" clock-face example from: J. F. Bartlett, “Don’t
 ;; Fidget with Widgets, Draw!,” Palo Alto, California, DEC WRL
 ;; Research Report 91/6, May 1991.
diff --git a/racket/syndicate-gl/examples/many.rkt b/racket/syndicate-gl/examples/many.rkt
index d6bc7f7..ea0c79c 100644
--- a/racket/syndicate-gl/examples/many.rkt
+++ b/racket/syndicate-gl/examples/many.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Multiple animated sprites.
 ;;
 ;; 2016-12-12 With the current implementations of (a) Syndicate's
diff --git a/racket/syndicate/big-bang/timestate.rkt b/racket/syndicate/big-bang/timestate.rkt
index bc61cbd..81170c2 100644
--- a/racket/syndicate/big-bang/timestate.rkt
+++ b/racket/syndicate/big-bang/timestate.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Big-bang specific timestate implementation with compatible protocol.
 
 (provide (struct-out later-than)
diff --git a/racket/syndicate/broker/server.rkt b/racket/syndicate/broker/server.rkt
index 57399ed..e011ca5 100644
--- a/racket/syndicate/broker/server.rkt
+++ b/racket/syndicate/broker/server.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Generic relay for WebSockets/TCP/etc-based participation in a network.
 
 (provide spawn-broker-server
diff --git a/racket/syndicate/drivers/config.rkt b/racket/syndicate/drivers/config.rkt
index 0bcf10b..988f0bf 100644
--- a/racket/syndicate/drivers/config.rkt
+++ b/racket/syndicate/drivers/config.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Monitor configuration files.
 
 (provide (struct-out config)
diff --git a/racket/syndicate/drivers/filesystem.rkt b/racket/syndicate/drivers/filesystem.rkt
index 6444fb0..9e209d9 100644
--- a/racket/syndicate/drivers/filesystem.rkt
+++ b/racket/syndicate/drivers/filesystem.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Filesystem change monitor driver
 
 (provide (struct-out file-content)
diff --git a/racket/syndicate/drivers/gui.rkt b/racket/syndicate/drivers/gui.rkt
index 26dc60b..58929b2 100644
--- a/racket/syndicate/drivers/gui.rkt
+++ b/racket/syndicate/drivers/gui.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Driver for Racket's GUI.
 
 (require racket/class)
diff --git a/racket/syndicate/drivers/irc.rkt b/racket/syndicate/drivers/irc.rkt
index 0c513a0..5ef3d9f 100644
--- a/racket/syndicate/drivers/irc.rkt
+++ b/racket/syndicate/drivers/irc.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Dreadfully simplified IRC client driver.
 
 (provide (struct-out irc-connection)
diff --git a/racket/syndicate/drivers/line-reader.rkt b/racket/syndicate/drivers/line-reader.rkt
index 68650d7..572db6c 100644
--- a/racket/syndicate/drivers/line-reader.rkt
+++ b/racket/syndicate/drivers/line-reader.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out tcp-channel-line))
 
diff --git a/racket/syndicate/drivers/smtp.rkt b/racket/syndicate/drivers/smtp.rkt
index be8f403..77f06f5 100644
--- a/racket/syndicate/drivers/smtp.rkt
+++ b/racket/syndicate/drivers/smtp.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out/defaults [make-smtp-account-config smtp-account-config])
          (rename-out [smtp-account-config <smtp-account-config>])
diff --git a/racket/syndicate/drivers/timestate.rkt b/racket/syndicate/drivers/timestate.rkt
index df71a54..dd1cd77 100644
--- a/racket/syndicate/drivers/timestate.rkt
+++ b/racket/syndicate/drivers/timestate.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (provide (struct-out later-than)
          stop-when-timeout
diff --git a/racket/syndicate/drivers/web.rkt b/racket/syndicate/drivers/web.rkt
index dccccaa..4b90fd4 100644
--- a/racket/syndicate/drivers/web.rkt
+++ b/racket/syndicate/drivers/web.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; More general web driver: supports normal HTTP as well as websockets.
 
 (provide (struct-out web-virtual-host)
diff --git a/racket/syndicate/examples/actor/bank-account.rkt b/racket/syndicate/examples/actor/bank-account.rkt
index a55559b..f65b764 100644
--- a/racket/syndicate/examples/actor/bank-account.rkt
+++ b/racket/syndicate/examples/actor/bank-account.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Hello-worldish "bank account" example.
 
 (struct account (balance) #:prefab)
diff --git a/racket/syndicate/examples/actor/big-bang.rkt b/racket/syndicate/examples/actor/big-bang.rkt
index e9b470a..5369b80 100644
--- a/racket/syndicate/examples/actor/big-bang.rkt
+++ b/racket/syndicate/examples/actor/big-bang.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/big-bang)
 (require racket/math)
diff --git a/racket/syndicate/examples/actor/box-and-client.rkt b/racket/syndicate/examples/actor/box-and-client.rkt
index f4f773c..1cc7e6b 100644
--- a/racket/syndicate/examples/actor/box-and-client.rkt
+++ b/racket/syndicate/examples/actor/box-and-client.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Simple mutable box and count-to-infinity box client.
 
 (struct set-box (new-value) #:transparent)
diff --git a/racket/syndicate/examples/actor/broadcast-messages.rkt b/racket/syndicate/examples/actor/broadcast-messages.rkt
index 6787338..b7efc05 100644
--- a/racket/syndicate/examples/actor/broadcast-messages.rkt
+++ b/racket/syndicate/examples/actor/broadcast-messages.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrate sending a message to multiple receivers.
 
 (struct envelope (destination message) #:prefab)
diff --git a/racket/syndicate/examples/actor/chain.rkt b/racket/syndicate/examples/actor/chain.rkt
index f05ee77..6680e2c 100644
--- a/racket/syndicate/examples/actor/chain.rkt
+++ b/racket/syndicate/examples/actor/chain.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/drivers/timestate)
 
diff --git a/racket/syndicate/examples/actor/chat-client.rkt b/racket/syndicate/examples/actor/chat-client.rkt
index 66074f7..8dcedd6 100644
--- a/racket/syndicate/examples/actor/chat-client.rkt
+++ b/racket/syndicate/examples/actor/chat-client.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/chat-multiroom-topic-persist.rkt b/racket/syndicate/examples/actor/chat-multiroom-topic-persist.rkt
index a5c6c49..2ac2509 100644
--- a/racket/syndicate/examples/actor/chat-multiroom-topic-persist.rkt
+++ b/racket/syndicate/examples/actor/chat-multiroom-topic-persist.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Evolution of chat-multiroom-topic.rkt to support persistent room topics.
 
 (require syndicate/protocol/advertise)
diff --git a/racket/syndicate/examples/actor/chat-multiroom-topic.rkt b/racket/syndicate/examples/actor/chat-multiroom-topic.rkt
index 6e17983..3f54ec6 100644
--- a/racket/syndicate/examples/actor/chat-multiroom-topic.rkt
+++ b/racket/syndicate/examples/actor/chat-multiroom-topic.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Evolution of chat-multiroom.rkt to support room topics.
 
 (require syndicate/protocol/advertise)
diff --git a/racket/syndicate/examples/actor/chat-multiroom.rkt b/racket/syndicate/examples/actor/chat-multiroom.rkt
index c96411e..d014747 100644
--- a/racket/syndicate/examples/actor/chat-multiroom.rkt
+++ b/racket/syndicate/examples/actor/chat-multiroom.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Evolution of chat-simplified-internals2.rkt to support multiple rooms.
 ;; Uses the approach of modifying the protocol to include a room name.
 
diff --git a/racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt b/racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt
index c3348af..ed92a72 100644
--- a/racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt
+++ b/racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/chat-no-quit-world.rkt b/racket/syndicate/examples/actor/chat-no-quit-world.rkt
index ec2387b..37154a0 100644
--- a/racket/syndicate/examples/actor/chat-no-quit-world.rkt
+++ b/racket/syndicate/examples/actor/chat-no-quit-world.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/chat-simplified-internals.rkt b/racket/syndicate/examples/actor/chat-simplified-internals.rkt
index 3e8f6c5..3b80aba 100644
--- a/racket/syndicate/examples/actor/chat-simplified-internals.rkt
+++ b/racket/syndicate/examples/actor/chat-simplified-internals.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/chat-simplified-internals2.rkt b/racket/syndicate/examples/actor/chat-simplified-internals2.rkt
index 2c30e4b..5009f22 100644
--- a/racket/syndicate/examples/actor/chat-simplified-internals2.rkt
+++ b/racket/syndicate/examples/actor/chat-simplified-internals2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/chat.rkt b/racket/syndicate/examples/actor/chat.rkt
index 15716ad..185f9d2 100644
--- a/racket/syndicate/examples/actor/chat.rkt
+++ b/racket/syndicate/examples/actor/chat.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/double-click.rkt b/racket/syndicate/examples/actor/double-click.rkt
index db6fbc8..c5e7e87 100644
--- a/racket/syndicate/examples/actor/double-click.rkt
+++ b/racket/syndicate/examples/actor/double-click.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates debouncer-like functionality.
 
 (require syndicate/big-bang)
diff --git a/racket/syndicate/examples/actor/echo.rkt b/racket/syndicate/examples/actor/echo.rkt
index 926cae4..18a22b4 100644
--- a/racket/syndicate/examples/actor/echo.rkt
+++ b/racket/syndicate/examples/actor/echo.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/protocol/advertise)
 (require/activate syndicate/drivers/tcp)
diff --git a/racket/syndicate/examples/actor/example-action-after-suspension.rkt b/racket/syndicate/examples/actor/example-action-after-suspension.rkt
index 8bebc8f..773da42 100644
--- a/racket/syndicate/examples/actor/example-action-after-suspension.rkt
+++ b/racket/syndicate/examples/actor/example-action-after-suspension.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Test case for a bug relating to use of parameters to accumulate
 ;; actions across react/suspend when an intermediate parameterization
 ;; for current-dataflow-subject-id has taken place.
diff --git a/racket/syndicate/examples/actor/example-assertion-spike.rkt b/racket/syndicate/examples/actor/example-assertion-spike.rkt
index 0e1b900..59abe48 100644
--- a/racket/syndicate/examples/actor/example-assertion-spike.rkt
+++ b/racket/syndicate/examples/actor/example-assertion-spike.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;;
 ;; Test case for a problem written up on 25 Oct 2016 in my research
 ;; journal.
diff --git a/racket/syndicate/examples/actor/example-bug-query-scope.rkt b/racket/syndicate/examples/actor/example-bug-query-scope.rkt
index ae24e0a..706a518 100644
--- a/racket/syndicate/examples/actor/example-bug-query-scope.rkt
+++ b/racket/syndicate/examples/actor/example-bug-query-scope.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates a (fixed) bug in define/query-value scoping.
 ;;
 ;; Buggy output:
diff --git a/racket/syndicate/examples/actor/example-bug-rising-edge-true.rkt b/racket/syndicate/examples/actor/example-bug-rising-edge-true.rkt
index fcd8ca3..f66bab9 100644
--- a/racket/syndicate/examples/actor/example-bug-rising-edge-true.rkt
+++ b/racket/syndicate/examples/actor/example-bug-rising-edge-true.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates a bug: rising-edge of a predicate that starts off true
 ;; yields a crash.
 ;;
diff --git a/racket/syndicate/examples/actor/example-during-criterion-snapshotting.rkt b/racket/syndicate/examples/actor/example-during-criterion-snapshotting.rkt
index a51c1f5..35478bf 100644
--- a/racket/syndicate/examples/actor/example-during-criterion-snapshotting.rkt
+++ b/racket/syndicate/examples/actor/example-during-criterion-snapshotting.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Illustrates a (now fixed) bug where mutation altering a
 ;; subscription caused the `retracted` half of a during instance to be
 ;; lost.
diff --git a/racket/syndicate/examples/actor/example-filesystem.rkt b/racket/syndicate/examples/actor/example-filesystem.rkt
index cbd5e0a..d8b1971 100644
--- a/racket/syndicate/examples/actor/example-filesystem.rkt
+++ b/racket/syndicate/examples/actor/example-filesystem.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/drivers/filesystem)
 (require racket/file)
diff --git a/racket/syndicate/examples/actor/example-glitch.rkt b/racket/syndicate/examples/actor/example-glitch.rkt
index 219c85b..8ca94b7 100644
--- a/racket/syndicate/examples/actor/example-glitch.rkt
+++ b/racket/syndicate/examples/actor/example-glitch.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrate FRP-like "glitching"
 ;;
 ;; Based on an example from the FRP survey of Bainomugisha et al.
diff --git a/racket/syndicate/examples/actor/example-multiple-suspension-resumption.rkt b/racket/syndicate/examples/actor/example-multiple-suspension-resumption.rkt
index 94e8275..4c6dea5 100644
--- a/racket/syndicate/examples/actor/example-multiple-suspension-resumption.rkt
+++ b/racket/syndicate/examples/actor/example-multiple-suspension-resumption.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Shows that the checks enforcing single-use suspension-resumption are working.
 
 (spawn #:name 'shouldnt-work
diff --git a/racket/syndicate/examples/actor/example-partial-retraction.rkt b/racket/syndicate/examples/actor/example-partial-retraction.rkt
index 8923c5c..098dcec 100644
--- a/racket/syndicate/examples/actor/example-partial-retraction.rkt
+++ b/racket/syndicate/examples/actor/example-partial-retraction.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Illustrates the response of asserted / retracted / during to
 ;; observation of assertions discarding some of their dimensions.
 
diff --git a/racket/syndicate/examples/actor/example-responsibility-transfer-1.rkt b/racket/syndicate/examples/actor/example-responsibility-transfer-1.rkt
index a786526..fc81168 100644
--- a/racket/syndicate/examples/actor/example-responsibility-transfer-1.rkt
+++ b/racket/syndicate/examples/actor/example-responsibility-transfer-1.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates glitch preservation in during/spawn.
 ;;
 ;; Previously, `spawn` was expanded in place into the new actor's
diff --git a/racket/syndicate/examples/actor/example-responsibility-transfer-2.rkt b/racket/syndicate/examples/actor/example-responsibility-transfer-2.rkt
index 9708543..ecfd833 100644
--- a/racket/syndicate/examples/actor/example-responsibility-transfer-2.rkt
+++ b/racket/syndicate/examples/actor/example-responsibility-transfer-2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates responsibility transfer.
 ;;
 ;; Previously, `spawn` was expanded in place into the new actor's
diff --git a/racket/syndicate/examples/actor/example-supervise.rkt b/racket/syndicate/examples/actor/example-supervise.rkt
index b99c49a..45abff7 100644
--- a/racket/syndicate/examples/actor/example-supervise.rkt
+++ b/racket/syndicate/examples/actor/example-supervise.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Shows the difference between a supervised exit and a supervised crash.
 
 (require/activate syndicate/supervise)
diff --git a/racket/syndicate/examples/actor/example-synthetic-patch.rkt b/racket/syndicate/examples/actor/example-synthetic-patch.rkt
index 287a5e0..9ec589b 100644
--- a/racket/syndicate/examples/actor/example-synthetic-patch.rkt
+++ b/racket/syndicate/examples/actor/example-synthetic-patch.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Illustrates a (now fixed) bug where creating a facet interested in something
 ;; already known didn't properly trigger the assertion-handler.
 ;;
diff --git a/racket/syndicate/examples/actor/example-termination-scripts-1.rkt b/racket/syndicate/examples/actor/example-termination-scripts-1.rkt
index c3cea0b..799b224 100644
--- a/racket/syndicate/examples/actor/example-termination-scripts-1.rkt
+++ b/racket/syndicate/examples/actor/example-termination-scripts-1.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrate handling of facet termination.
 ;;
 ;; Prior to early November, 2016, only a *single* stop-when was able
diff --git a/racket/syndicate/examples/actor/example-termination-scripts-2.rkt b/racket/syndicate/examples/actor/example-termination-scripts-2.rkt
index 49ccda0..9d02eec 100644
--- a/racket/syndicate/examples/actor/example-termination-scripts-2.rkt
+++ b/racket/syndicate/examples/actor/example-termination-scripts-2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrate handling of facet termination.
 
 (require racket/pretty)
diff --git a/racket/syndicate/examples/actor/f-to-c.rkt b/racket/syndicate/examples/actor/f-to-c.rkt
index aba854e..016eef6 100644
--- a/racket/syndicate/examples/actor/f-to-c.rkt
+++ b/racket/syndicate/examples/actor/f-to-c.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; After the Fahrenheit-to-Celsius converter example in "Fabrik - A
 ;; Visual Programming Environment", Ingalls, Wallace, Chow, Ludolph
 ;; and Doyle, OOPSLA 1988.
diff --git a/racket/syndicate/examples/actor/f-to-c2.rkt b/racket/syndicate/examples/actor/f-to-c2.rkt
index fb0441d..699f409 100644
--- a/racket/syndicate/examples/actor/f-to-c2.rkt
+++ b/racket/syndicate/examples/actor/f-to-c2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; After the Fahrenheit-to-Celsius converter example in "Fabrik - A
 ;; Visual Programming Environment", Ingalls, Wallace, Chow, Ludolph
 ;; and Doyle, OOPSLA 1988.
diff --git a/racket/syndicate/examples/actor/fib-server.rkt b/racket/syndicate/examples/actor/fib-server.rkt
index 638d444..325db6e 100644
--- a/racket/syndicate/examples/actor/fib-server.rkt
+++ b/racket/syndicate/examples/actor/fib-server.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/threaded)
 (require/activate syndicate/drivers/timer)
diff --git a/racket/syndicate/examples/actor/file-system-during.rkt b/racket/syndicate/examples/actor/file-system-during.rkt
index fa26539..fa78ad4 100644
--- a/racket/syndicate/examples/actor/file-system-during.rkt
+++ b/racket/syndicate/examples/actor/file-system-during.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Toy file system, based on the example in the ESOP2016 submission.
 ;; syndicate/actor implementation, using "during" instead of "on asserted/until retracted".
 
diff --git a/racket/syndicate/examples/actor/file-system-during2.rkt b/racket/syndicate/examples/actor/file-system-during2.rkt
index 9368943..bac401b 100644
--- a/racket/syndicate/examples/actor/file-system-during2.rkt
+++ b/racket/syndicate/examples/actor/file-system-during2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Toy file system, based on the example in the ESOP2016 submission.
 ;; syndicate/actor implementation, using "during" instead of "on asserted/until retracted".
 
diff --git a/racket/syndicate/examples/actor/file-system-lll.rkt b/racket/syndicate/examples/actor/file-system-lll.rkt
index e119655..675b5ad 100644
--- a/racket/syndicate/examples/actor/file-system-lll.rkt
+++ b/racket/syndicate/examples/actor/file-system-lll.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Toy file system, based on the example in the ESOP2016 submission.
 ;; Low-level implementation.
 
diff --git a/racket/syndicate/examples/actor/file-system-lll2.rkt b/racket/syndicate/examples/actor/file-system-lll2.rkt
index 221ac2e..044ac99 100644
--- a/racket/syndicate/examples/actor/file-system-lll2.rkt
+++ b/racket/syndicate/examples/actor/file-system-lll2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Toy file system, based on the example in the ESOP2016 submission.
 ;; Low-level implementation, without subconversation.
 
diff --git a/racket/syndicate/examples/actor/file-system.rkt b/racket/syndicate/examples/actor/file-system.rkt
index f99bc86..afca486 100644
--- a/racket/syndicate/examples/actor/file-system.rkt
+++ b/racket/syndicate/examples/actor/file-system.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Toy file system, based on the example in the ESOP2016 submission.
 ;; syndicate/actor implementation.
 
diff --git a/racket/syndicate/examples/actor/file-system2.rkt b/racket/syndicate/examples/actor/file-system2.rkt
index 6638036..22a4d9b 100644
--- a/racket/syndicate/examples/actor/file-system2.rkt
+++ b/racket/syndicate/examples/actor/file-system2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Toy file system, based on the example in the ESOP2016 submission.
 ;; syndicate/actor implementation, without subconversation.
 
diff --git a/racket/syndicate/examples/actor/firewall-demo.rkt b/racket/syndicate/examples/actor/firewall-demo.rkt
index 5fade94..ed65bff 100644
--- a/racket/syndicate/examples/actor/firewall-demo.rkt
+++ b/racket/syndicate/examples/actor/firewall-demo.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require syndicate/firewall)
 
diff --git a/racket/syndicate/examples/actor/forward-chaining-mini.rkt b/racket/syndicate/examples/actor/forward-chaining-mini.rkt
index b0a979a..3e350c6 100644
--- a/racket/syndicate/examples/actor/forward-chaining-mini.rkt
+++ b/racket/syndicate/examples/actor/forward-chaining-mini.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Minimal syndicate/actor variation on examples/forward-chaining.rkt.
 
 (spawn (assert `(parent john douglas)))
diff --git a/racket/syndicate/examples/actor/fs-protocol.rkt b/racket/syndicate/examples/actor/fs-protocol.rkt
index 1697956..7e2cf61 100644
--- a/racket/syndicate/examples/actor/fs-protocol.rkt
+++ b/racket/syndicate/examples/actor/fs-protocol.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; File System Demo protocol
 
 (provide (struct-out file)
diff --git a/racket/syndicate/examples/actor/fs-shell.rkt b/racket/syndicate/examples/actor/fs-shell.rkt
index 0410b27..97c5fa0 100644
--- a/racket/syndicate/examples/actor/fs-shell.rkt
+++ b/racket/syndicate/examples/actor/fs-shell.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Simple "shell" or REPL, used by the file-system demos.
 
 (require (only-in racket/port read-bytes-line-evt))
diff --git a/racket/syndicate/examples/actor/gui.rkt b/racket/syndicate/examples/actor/gui.rkt
index e16fa6b..b49bcaf 100644
--- a/racket/syndicate/examples/actor/gui.rkt
+++ b/racket/syndicate/examples/actor/gui.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Small test program for the gui.rkt driver
 
 (require/activate syndicate/drivers/gui)
diff --git a/racket/syndicate/examples/actor/irc.rkt b/racket/syndicate/examples/actor/irc.rkt
index e0c33d3..8c1bfad 100644
--- a/racket/syndicate/examples/actor/irc.rkt
+++ b/racket/syndicate/examples/actor/irc.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/drivers/irc)
 
diff --git a/racket/syndicate/examples/actor/let-event.rkt b/racket/syndicate/examples/actor/let-event.rkt
index ad2b6a6..3ee6f03 100644
--- a/racket/syndicate/examples/actor/let-event.rkt
+++ b/racket/syndicate/examples/actor/let-event.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrate let-event.
 ;; Should print "Complete.".
 
diff --git a/racket/syndicate/examples/actor/mini-echo.rkt b/racket/syndicate/examples/actor/mini-echo.rkt
index f132259..70805d0 100644
--- a/racket/syndicate/examples/actor/mini-echo.rkt
+++ b/racket/syndicate/examples/actor/mini-echo.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (struct echo-req (body) #:prefab)
 (struct echo-resp (body) #:prefab)
diff --git a/racket/syndicate/examples/actor/mutex.rkt b/racket/syndicate/examples/actor/mutex.rkt
index 93350d0..d8731f7 100644
--- a/racket/syndicate/examples/actor/mutex.rkt
+++ b/racket/syndicate/examples/actor/mutex.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Counting-semaphore-like mutex, and dining philosophers.
 
 (require racket/set)
diff --git a/racket/syndicate/examples/actor/parameters.rkt b/racket/syndicate/examples/actor/parameters.rkt
index 274a210..b305423 100644
--- a/racket/syndicate/examples/actor/parameters.rkt
+++ b/racket/syndicate/examples/actor/parameters.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrate use of parameters with actors.
 ;;
 ;; Per https://github.com/tonyg/syndicate/issues/10, "Parameters don't
diff --git a/racket/syndicate/examples/actor/query-set.rkt b/racket/syndicate/examples/actor/query-set.rkt
index 13a0bc4..a92ba09 100644
--- a/racket/syndicate/examples/actor/query-set.rkt
+++ b/racket/syndicate/examples/actor/query-set.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require racket/set)
 
diff --git a/racket/syndicate/examples/actor/queue-no-credit.rkt b/racket/syndicate/examples/actor/queue-no-credit.rkt
index 1e33b08..6b8c9f2 100644
--- a/racket/syndicate/examples/actor/queue-no-credit.rkt
+++ b/racket/syndicate/examples/actor/queue-no-credit.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; A Queue with no flow control.
 
 (require racket/set)
diff --git a/racket/syndicate/examples/actor/queue-no-credit2.rkt b/racket/syndicate/examples/actor/queue-no-credit2.rkt
index b2971c4..563d09f 100644
--- a/racket/syndicate/examples/actor/queue-no-credit2.rkt
+++ b/racket/syndicate/examples/actor/queue-no-credit2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; A Queue with no flow control.
 
 (require racket/set)
diff --git a/racket/syndicate/examples/actor/queue.rkt b/racket/syndicate/examples/actor/queue.rkt
index d1e03ad..b6b3c04 100644
--- a/racket/syndicate/examples/actor/queue.rkt
+++ b/racket/syndicate/examples/actor/queue.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; A Queue with credit-based flow control.
 
 (require racket/set)
diff --git a/racket/syndicate/examples/actor/sandbox-os.rkt b/racket/syndicate/examples/actor/sandbox-os.rkt
index f6d88a1..641c076 100644
--- a/racket/syndicate/examples/actor/sandbox-os.rkt
+++ b/racket/syndicate/examples/actor/sandbox-os.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Explore use of sandboxes etc for being an "operating system"
 
 (require racket/match)
diff --git a/racket/syndicate/examples/actor/show-field-scope-enforcement1.rkt b/racket/syndicate/examples/actor/show-field-scope-enforcement1.rkt
index f5340f7..9ef46ca 100644
--- a/racket/syndicate/examples/actor/show-field-scope-enforcement1.rkt
+++ b/racket/syndicate/examples/actor/show-field-scope-enforcement1.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates that fields may not be passed between actors.
 
 (spawn #:name 'reading-actor
diff --git a/racket/syndicate/examples/actor/show-field-scope-enforcement4.rkt b/racket/syndicate/examples/actor/show-field-scope-enforcement4.rkt
index 594dbd4..a9fd2e1 100644
--- a/racket/syndicate/examples/actor/show-field-scope-enforcement4.rkt
+++ b/racket/syndicate/examples/actor/show-field-scope-enforcement4.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates that fields at actor scope are visible to facets.
 
 (spawn* (field [x 123])
diff --git a/racket/syndicate/examples/actor/spreadsheet.rkt b/racket/syndicate/examples/actor/spreadsheet.rkt
index f0a0017..c90ec00 100644
--- a/racket/syndicate/examples/actor/spreadsheet.rkt
+++ b/racket/syndicate/examples/actor/spreadsheet.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; A toy spreadsheet model.
 
 (require racket/set)
diff --git a/racket/syndicate/examples/actor/timestate.rkt b/racket/syndicate/examples/actor/timestate.rkt
index a5ad5b9..ffc76c5 100644
--- a/racket/syndicate/examples/actor/timestate.rkt
+++ b/racket/syndicate/examples/actor/timestate.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/drivers/timestate)
 
diff --git a/racket/syndicate/examples/actor/two-buyer-protocol.rkt b/racket/syndicate/examples/actor/two-buyer-protocol.rkt
index f5f5eae..2d17986 100644
--- a/racket/syndicate/examples/actor/two-buyer-protocol.rkt
+++ b/racket/syndicate/examples/actor/two-buyer-protocol.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; An extended two-buyer book-purchase protocol, based loosely on that
 ;; given in Honda/Yoshida/Carbone 2008, "Multiparty Asynchronous
 ;; Session Types".
diff --git a/racket/syndicate/examples/actor/vacuous-facet.rkt b/racket/syndicate/examples/actor/vacuous-facet.rkt
index 1abc3f3..4a90737 100644
--- a/racket/syndicate/examples/actor/vacuous-facet.rkt
+++ b/racket/syndicate/examples/actor/vacuous-facet.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Demonstrates that facets with no endpoints don't outlive their `add-facet!` call.
 
 ;; This actor will have two facets briefly, before dropping to one:
diff --git a/racket/syndicate/examples/actor/web-demo.rkt b/racket/syndicate/examples/actor/web-demo.rkt
index 7a128ca..6a1b060 100644
--- a/racket/syndicate/examples/actor/web-demo.rkt
+++ b/racket/syndicate/examples/actor/web-demo.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Simple demo of web driver. See web-demo.rkt for a more realistic example.
 
 (require/activate syndicate/drivers/timer)
diff --git a/racket/syndicate/examples/actor/web-sanity-check.rkt b/racket/syndicate/examples/actor/web-sanity-check.rkt
index 6441f32..5887022 100644
--- a/racket/syndicate/examples/actor/web-sanity-check.rkt
+++ b/racket/syndicate/examples/actor/web-sanity-check.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Simple demo of web driver. See web-demo.rkt for a more realistic example.
 
 (require/activate syndicate/drivers/timer)
diff --git a/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt
index 55ebb7f..bd891ea 100644
--- a/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt
+++ b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; After Figure 1 in "Logic and lattices for distributed programming",
 ;; Conway et. al, UCB tech report, 2012
 ;;
diff --git a/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt
index e5fdfb9..3c2978a 100644
--- a/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt
+++ b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; After Figure 1 in "Logic and lattices for distributed programming",
 ;; Conway et. al, UCB tech report, 2012
 ;;
diff --git a/racket/syndicate/examples/udp-multicast.rkt b/racket/syndicate/examples/udp-multicast.rkt
index 2c10808..e2f6c81 100644
--- a/racket/syndicate/examples/udp-multicast.rkt
+++ b/racket/syndicate/examples/udp-multicast.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (require/activate syndicate/drivers/timer)
 (require/activate syndicate/drivers/udp)
diff --git a/racket/syndicate/examples/ws-echo-client.rkt b/racket/syndicate/examples/ws-echo-client.rkt
index d238972..0bcf166 100644
--- a/racket/syndicate/examples/ws-echo-client.rkt
+++ b/racket/syndicate/examples/ws-echo-client.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Websocket echo client
 ;; racket ws-echo-client.rkt ws://localhost:8081/
 ;; racket ws-echo-client.rkt wss://localhost:8084/
diff --git a/racket/syndicate/examples/ws-echo.rkt b/racket/syndicate/examples/ws-echo.rkt
index 6b13d8d..a430259 100644
--- a/racket/syndicate/examples/ws-echo.rkt
+++ b/racket/syndicate/examples/ws-echo.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Websocket server that echoes all it receives
 
 (require syndicate/protocol/advertise)
diff --git a/racket/syndicate/lang.rkt b/racket/syndicate/lang.rkt
new file mode 100644
index 0000000..b21c843
--- /dev/null
+++ b/racket/syndicate/lang.rkt
@@ -0,0 +1,4 @@
+#lang racket/base
+
+(require "actor-lang.rkt")
+(provide (all-from-out "actor-lang.rkt"))
diff --git a/racket/syndicate/reload.rkt b/racket/syndicate/reload.rkt
index 4259062..2f2c58f 100644
--- a/racket/syndicate/reload.rkt
+++ b/racket/syndicate/reload.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Crude steps toward reloadable Syndicate modules
 
 (provide (except-out (struct-out reload-pending) reload-pending)
diff --git a/racket/syndicate/supervise.rkt b/racket/syndicate/supervise.rkt
index 26a40f8..5c8e17c 100644
--- a/racket/syndicate/supervise.rkt
+++ b/racket/syndicate/supervise.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 ;; Extremely simple single-actor supervision
 ;; Vastly simplified compared to the available options in OTP
 
diff --git a/racket/syndicate/tests/boop.rkt b/racket/syndicate/tests/boop.rkt
index ce2d4ae..bbfbb68 100644
--- a/racket/syndicate/tests/boop.rkt
+++ b/racket/syndicate/tests/boop.rkt
@@ -1,4 +1,4 @@
-#lang syndicate/actor
+#lang syndicate
 
 (dataspace