diff --git a/docs/maps/api-controls.md b/docs/maps/api-controls.md
index dcb0f17b..c2b47262 100644
--- a/docs/maps/api-controls.md
+++ b/docs/maps/api-controls.md
@@ -15,7 +15,7 @@ When controls are disabled, the user cannot move anymore using keyboard input. T
 Example:
 
 ```javascript
-WA.room.onEnterZone('myZone', () => {
+WA.room.onEnterLayer('myZone').subscribe(() => {
     WA.controls.disablePlayerControls();
     WA.ui.openPopup("popupRectangle", 'This is an imporant message!', [{
         label: "Got it!",
@@ -25,5 +25,5 @@ WA.room.onEnterZone('myZone', () => {
             popup.close();
         }
     }]);
-});
+})
 ```
diff --git a/docs/maps/api-ui.md b/docs/maps/api-ui.md
index dc701500..8583c061 100644
--- a/docs/maps/api-ui.md
+++ b/docs/maps/api-ui.md
@@ -49,7 +49,7 @@ Example:
 let helloWorldPopup;
 
 // Open the popup when we enter a given zone
-helloWorldPopup = WA.room.onEnterZone('myZone', () => {
+helloWorldPopup = WA.room.onEnterLayer("myZone").subscribe(() => {
     WA.ui.openPopup("popupRectangle", 'Hello world!', [{
         label: "Close",
         className: "primary",
@@ -57,13 +57,13 @@ helloWorldPopup = WA.room.onEnterZone('myZone', () => {
             // Close the popup when the "Close" button is pressed.
             popup.close();
         }
-    });
-}]);
+    }]);
+});
 
 // Close the popup when we leave the zone.
-WA.room.onLeaveZone('myZone', () => {
+WA.room.onLeaveLayer("myZone").subscribe(() => {
     helloWorldPopup.close();
-});
+})
 ```
 
 ### Add custom menu
diff --git a/maps/tests/TriggerMessageApi/script.js b/maps/tests/TriggerMessageApi/script.js
index 9ab02ec2..4041d98b 100644
--- a/maps/tests/TriggerMessageApi/script.js
+++ b/maps/tests/TriggerMessageApi/script.js
@@ -1,16 +1,18 @@
 WA.onInit().then(() => {
-    let message;
+  let message;
 
-    WA.room.onEnterZone("carpet", () => {
-        message = WA.ui.displayActionMessage({
-            message: "This is a test message. Press space to display a chat message. Walk out to hide the message.",
-            callback: () => {
-                WA.chat.sendChatMessage("Hello world!", "The bot");
-            }
-        });
+  WA.room.onEnterLayer("carpet").subscribe(() => {
+    message = WA.ui.displayActionMessage({
+      message:
+        "This is a test message. Press space to display a chat message. Walk out to hide the message.",
+      callback: () => {
+        WA.chat.sendChatMessage("Hello world!", "The bot");
+      },
     });
+  });
 
-    WA.room.onLeaveZone("carpet", () => {
-        message && message.remove();
-    });
+
+  WA.room.onLeaveLayer("carpet").subscribe(() => {
+    message && message.remove();
+  });
 });