diff --git a/api/database/datamodel.graphql b/api/database/datamodel.graphql
index ecc123805..258a2978b 100644
--- a/api/database/datamodel.graphql
+++ b/api/database/datamodel.graphql
@@ -19,10 +19,10 @@ enum FBType {
 }
 
 enum FBKind {
-  TRADER
-  INDICATOR
-  EXTRACTOR
-  PLOTTER
+  Trader
+  Indicator
+  Sensor
+  Plotter
 }
 
 type Team {
diff --git a/api/src/graphql/resolvers/Mutation/index.js b/api/src/graphql/resolvers/Mutation/index.js
index 618a3ab5c..2cf2bff79 100644
--- a/api/src/graphql/resolvers/Mutation/index.js
+++ b/api/src/graphql/resolvers/Mutation/index.js
@@ -98,14 +98,14 @@ export const resolvers = {
       let createTeam
       if(existingMember !== null && existingMember.id !== null){
         logger.info('createTeam with existingMember:')
-        createTeam = await ctx.db.mutation.createTeam({ data: {name: name, slug: slug, owner: authId, members: {create: {member: {connect: {authId: authId}}, role: 'OWNER', status: { create: { status: 'ACTIVE', reason: `Connected to Team ${name}`}}}}, profile: {create: {avatar: avatar, banner: banner}}, fb: {create: {name: botName, slug: botSlug, kind:'TRADER', avatar: avatar, status: {create: {status: 'ACTIVE', reason: "Cloned on team creation"}}}}, status: {create: {status: 'ACTIVE', reason:"Team created"}}} }, TEAMS_FRAGMENT)
+        createTeam = await ctx.db.mutation.createTeam({ data: {name: name, slug: slug, owner: authId, members: {create: {member: {connect: {authId: authId}}, role: 'OWNER', status: { create: { status: 'ACTIVE', reason: `Connected to Team ${name}`}}}}, profile: {create: {avatar: avatar, banner: banner}}, fb: {create: {name: botName, slug: botSlug, kind:'Trader', avatar: avatar, status: {create: {status: 'ACTIVE', reason: "Cloned on team creation"}}}}, status: {create: {status: 'ACTIVE', reason:"Team created"}}} }, TEAMS_FRAGMENT)
           .catch((err) => {
             logger.debug(err, 'createTeamMutation error: ')
             return new DatabaseError(err)
           })
       } else {
         logger.info('createTeam without existingMember:')
-        createTeam = await ctx.db.mutation.createTeam({ data: {name: name, slug: slug, owner: authId, members: {create: {member: {create: {authId: authId, alias: alias, visible: true, status: { create: { status: 'ACTIVE', reason: `Created team ${name}`}}}}, role: 'OWNER', status: { create: { status: 'ACTIVE', reason: `Created with Team ${name}`}}}}, profile: {create: {avatar: avatar, banner: banner}}, fb: {create: {name: botName, slug: botSlug, kind:'TRADER', avatar: avatar, status: {create: {status: 'ACTIVE', reason: "Cloned on team creation"}}}}, status: {create: {status: 'ACTIVE', reason:"Team created"}}} }, TEAMS_FRAGMENT)
+        createTeam = await ctx.db.mutation.createTeam({ data: {name: name, slug: slug, owner: authId, members: {create: {member: {create: {authId: authId, alias: alias, visible: true, status: { create: { status: 'ACTIVE', reason: `Created team ${name}`}}}}, role: 'OWNER', status: { create: { status: 'ACTIVE', reason: `Created with Team ${name}`}}}}, profile: {create: {avatar: avatar, banner: banner}}, fb: {create: {name: botName, slug: botSlug, kind:'Trader', avatar: avatar, status: {create: {status: 'ACTIVE', reason: "Cloned on team creation"}}}}, status: {create: {status: 'ACTIVE', reason:"Team created"}}} }, TEAMS_FRAGMENT)
           .catch((err) => {
             logger.debug(err, 'createTeamMutation error: ')
             return new DatabaseError(err)
@@ -116,7 +116,7 @@ export const resolvers = {
       if(createTeam){
         createFB = await ctx.db.mutation.createFinancialBeings({ data:{
             type:'BOT',
-            kind:'INDICATOR',
+            kind:'Indicator',
             name:'Simulator ' + botName,
             slug:'simulator-' + botSlug,
             avatar:avatar,