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