diff --git a/src/old examples/matchmaking.tsx b/src/old examples/matchmaking.tsx
index 6c955c9..4d1a3c5 100644
--- a/src/old examples/matchmaking.tsx	
+++ b/src/old examples/matchmaking.tsx	
@@ -2,9 +2,9 @@
 import React, { useEffect, useState } from 'react'
 import { useHistory } from 'react-router-dom'
 
-import { API } from '@etherealengine/client-core/src/API'
 import { AuthService } from '@etherealengine/client-core/src/user/services/AuthService'
 import { matchUserPath } from '@etherealengine/common/src/schemas/matchmaking/match-user.schema'
+import { Engine } from '@etherealengine/ecs/src/Engine'
 import { MatchmakingTicketAssignment, OpenMatchTicket } from '@etherealengine/matchmaking/src/interfaces'
 import { matchTicketAssignmentPath } from '@etherealengine/matchmaking/src/match-ticket-assignment.schema'
 import { matchTicketPath } from '@etherealengine/matchmaking/src/match-ticket.schema'
@@ -12,13 +12,13 @@ import { matchTicketPath } from '@etherealengine/matchmaking/src/match-ticket.sc
 const gameModes = ['ctf', 'tournament']
 
 async function findCurrentTicketData() {
-  const { data } = await API.instance.client.service(matchUserPath).find()
+  const { data } = await Engine.instance.api.service(matchUserPath).find()
   if (data.length) {
     const matchUser = data[0]
-    const ticket = await API.instance.client.service(matchTicketPath).get(matchUser.ticketId)
+    const ticket = await Engine.instance.api.service(matchTicketPath).get(matchUser.ticketId)
     if (!ticket) {
       // ticket is outdated - delete match-user row
-      await API.instance.client.service(matchUserPath).remove(matchUser.id)
+      await Engine.instance.api.service(matchUserPath).remove(matchUser.id)
     } else {
       const gamemode = ticket.search_fields.tags[0]
       return { id: ticket.id, gamemode }
@@ -84,15 +84,15 @@ const Page = () => {
     setIsUpdating(true)
     let serverTicket: OpenMatchTicket
     try {
-      serverTicket = await API.instance.client.service(matchTicketPath).create({ gamemode })
+      serverTicket = await Engine.instance.api.service(matchTicketPath).create({ gamemode })
     } catch (e) {
-      const matchUser = (await API.instance.client.service(matchUserPath).find()).data[0]
-      serverTicket = await API.instance.client.service(matchTicketPath).get(matchUser.ticketId)
+      const matchUser = (await Engine.instance.api.service(matchUserPath).find()).data[0]
+      serverTicket = await Engine.instance.api.service(matchTicketPath).get(matchUser.ticketId)
       if (!serverTicket) {
         // cleanup
-        await API.instance.client.service(matchUserPath).remove(matchUser.id)
+        await Engine.instance.api.service(matchUserPath).remove(matchUser.id)
         // create new
-        serverTicket = await API.instance.client.service(matchTicketPath).create({ gamemode })
+        serverTicket = await Engine.instance.api.service(matchTicketPath).create({ gamemode })
       }
     }
 
@@ -114,14 +114,14 @@ const Page = () => {
     if (!ticketId) {
       return
     }
-    await API.instance.client.service(matchTicketPath).remove(ticketId)
+    await Engine.instance.api.service(matchTicketPath).remove(ticketId)
     setTicketData(undefined)
     // setStatus('')
   }
 
   function getAssignment(ticketId: string): Promise<MatchmakingTicketAssignment> {
     return (
-      API.instance.client.service(matchTicketAssignmentPath).get(ticketId) as Promise<MatchmakingTicketAssignment>
+      Engine.instance.api.service(matchTicketAssignmentPath).get(ticketId) as Promise<MatchmakingTicketAssignment>
     ).then((assignment) => {
       console.log('assignment', ticketId, assignment)
       return assignment
diff --git a/src/old examples/matchmaking2.tsx b/src/old examples/matchmaking2.tsx
index 8155c13..faf910c 100644
--- a/src/old examples/matchmaking2.tsx	
+++ b/src/old examples/matchmaking2.tsx	
@@ -2,9 +2,9 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { Link } from 'react-router-dom'
 
-import { API } from '@etherealengine/client-core/src/API'
 import { AuthService } from '@etherealengine/client-core/src/user/services/AuthService'
 import { matchUserPath } from '@etherealengine/common/src/schemas/matchmaking/match-user.schema'
+import { Engine } from '@etherealengine/ecs/src/Engine'
 import { OpenMatchTicketAssignment } from '@etherealengine/matchmaking/src/interfaces'
 import { matchTicketAssignmentPath } from '@etherealengine/matchmaking/src/match-ticket-assignment.schema'
 import { matchTicketPath } from '@etherealengine/matchmaking/src/match-ticket.schema'
@@ -23,10 +23,10 @@ const Page = () => {
   async function newTicket() {
     let ticket
     try {
-      ticket = await API.instance.client.service(matchTicketPath).create({ gamemode: 'mode.demo' })
+      ticket = await Engine.instance.api.service(matchTicketPath).create({ gamemode: 'mode.demo' })
     } catch (e) {
       alert('You already searching for game')
-      const matchUser = (await API.instance.client.service(matchUserPath).find()).data[0]
+      const matchUser = (await Engine.instance.api.service(matchUserPath).find()).data[0]
       console.log('matchUser', matchUser)
       ticket = { id: matchUser.ticketId }
     }
@@ -49,7 +49,7 @@ const Page = () => {
 
   function getAssignment(ticketId: string): Promise<OpenMatchTicketAssignment> {
     return (
-      API.instance.client.service(matchTicketAssignmentPath).get(ticketId) as Promise<OpenMatchTicketAssignment>
+      Engine.instance.api.service(matchTicketAssignmentPath).get(ticketId) as Promise<OpenMatchTicketAssignment>
     ).then((assignment) => {
       console.log('assignment', ticketId, assignment)
       connections.current[ticketId] = assignment.connection