diff --git a/server/src/index.js b/server/src/index.js
index ca0d696a3..1dc9c4473 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -7,9 +7,9 @@ import { createTransformedRemoteSchema } from './createRemoteSchema'
 import { teams } from './links'
 
 async function run () {
-  const transformedTeamsSchema = await createTransformedRemoteSchema('TeamsModule', process.env.TEAMS_API_URL)
-  const transformedUsersSchema = await createTransformedRemoteSchema('UsersModule', process.env.USERS_API_URL)
-  const transformedKeyVaultSchema = await createTransformedRemoteSchema('KeyVaultModule', process.env.KEYVAULT_API_URL)
+  const transformedTeamsSchema = await createTransformedRemoteSchema('teams_', process.env.TEAMS_API_URL)
+  const transformedUsersSchema = await createTransformedRemoteSchema('users_', process.env.USERS_API_URL)
+  const transformedKeyVaultSchema = await createTransformedRemoteSchema('keyVault_', process.env.KEYVAULT_API_URL)
 
   var schemas = []
   var resolvers = {}
@@ -48,7 +48,7 @@ async function run () {
       endpointURL: '/graphql',
       query: `
       {
-        TeamsModuleTeams{
+        teams_Teams{
           edges{
             node{
               name
diff --git a/server/src/links/teams.js b/server/src/links/teams.js
index cfc823ada..a06daf41c 100644
--- a/server/src/links/teams.js
+++ b/server/src/links/teams.js
@@ -1,20 +1,20 @@
 export const linkSchemaDefs =
   `
-    extend type TeamsModuleTeam {
-      ownerUser: UsersModuleUser
+    extend type teams_Team {
+      ownerUser: users_User
     }
   `
 
 export const resolver = (usersSchema) => ({
-  TeamsModuleTeam: {
+  teams_Team: {
     ownerUser: {
-      fragment: `fragment UserFragment on TeamsModuleTeam{owner}`,
+      fragment: `fragment UserFragment on teams_Team{owner}`,
       resolve (parent, args, context, info) {
         const authId = parent.owner
         return info.mergeInfo.delegateToSchema({
           schema: usersSchema,
           operation: 'query',
-          fieldName: 'UsersModuleUserByAuthId',
+          fieldName: 'users_UserByAuthId',
           args: { authId },
           context,
           info