diff --git a/code/client/cl_main.cc b/code/client/cl_main.cc
index 25a67e6..293ff07 100644
--- a/code/client/cl_main.cc
+++ b/code/client/cl_main.cc
@@ -3565,8 +3565,8 @@ void CL_Init(void)
 
   Cvar_Get("headmodel", "thug", CVAR_USERINFO | CVAR_ARCHIVE);
   Cvar_Get("team_headmodel", "thug", CVAR_USERINFO | CVAR_ARCHIVE);
-  Cvar_Get("g_dragonTeam", TEAM_NAME_DRAGONS, CVAR_SERVERINFO | CVAR_ARCHIVE);
-  Cvar_Get("g_nikkiTeam", TEAM_NAME_NIKKIS, CVAR_SERVERINFO | CVAR_ARCHIVE);
+  Cvar_Get("g_dragonTeam", DEFAULT_CLAN_DRAGONS, CVAR_SERVERINFO | CVAR_ARCHIVE);
+  Cvar_Get("g_nikkiTeam", DEFAULT_CLAN_NIKKIS, CVAR_SERVERINFO | CVAR_ARCHIVE);
   Cvar_Get("color1",  "4", CVAR_USERINFO | CVAR_ARCHIVE);
 	Cvar_Get ("color2", "5", CVAR_USERINFO | CVAR_ARCHIVE );
   Cvar_Get("handicap", "100", CVAR_USERINFO | CVAR_ARCHIVE);
diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 40dc97e..a21b9fc 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -312,9 +312,9 @@ void G_AddRandomBot(int team)
         skill = trap_Cvar_VariableValue("g_spSkill");
         //FIXME(0xA5EA): single player ??
         if (team == TEAM_DRAGONS)
-			teamstr = TEAM_NAME_DRAGONS;
+          teamstr = TEAM_SKIN_DRAGONS;
         else if (team == TEAM_NIKKIS)
-			teamstr = TEAM_NAME_NIKKIS;
+          teamstr = TEAM_SKIN_NIKKIS;
         else
           teamstr = "";
         strncpy(netname, value, sizeof(netname) - 1);
@@ -700,6 +700,7 @@ static void G_AddBot(const char *name, float skill, const char *team, int delay,
     model = "thug/default";
   }
   Info_SetValueForKey(userinfo, key, model);
+
   key = "team_model";
   Info_SetValueForKey(userinfo, key, model);
 
@@ -710,6 +711,7 @@ static void G_AddBot(const char *name, float skill, const char *team, int delay,
     headmodel = "thug";
   }
   Info_SetValueForKey(userinfo, key, headmodel);
+
   key = "team_headmodel";
   Info_SetValueForKey(userinfo, key, headmodel);
 
@@ -754,16 +756,16 @@ static void G_AddBot(const char *name, float skill, const char *team, int delay,
     {
       if (PickTeam(clientNum) == TEAM_DRAGONS)
       {
-		  team = TEAM_NAME_DRAGONS;
+        team = TEAM_SKIN_DRAGONS;
       }
       else
       {
-		  team = TEAM_NAME_NIKKIS;
+        team = TEAM_SKIN_NIKKIS;
       }
     }
     else
     {
-		team = TEAM_NAME_DRAGONS;
+      team = ""; // TEAM_SKIN_DRAGONS;
     }
   }
   Info_SetValueForKey(userinfo, "team", team);
diff --git a/code/game/g_main.c b/code/game/g_main.c
index d663269..5e765bb 100644
--- a/code/game/g_main.c
+++ b/code/game/g_main.c
@@ -216,9 +216,9 @@ static cvarTable_t gameCvarTable[] = {
    { &g_obeliskRespawnDelay, "g_obeliskRespawnDelay", "10", CVAR_SERVERINFO, 0, qfalse },
 
    { &g_cubeTimeout, "g_cubeTimeout", "30", 0, 0, qfalse },
-#endif //hypov8 dont show in browser
-  {&g_dragonTeam, "g_dragonTeam", TEAM_NAME_DRAGONS, CVAR_ARCHIVE /*| CVAR_SERVERINFO*/ | CVAR_USERINFO, 0, qtrue, qtrue},
-  {&g_nikkiTeam, "g_nikkiTeam", TEAM_NAME_NIKKIS, CVAR_ARCHIVE /*| CVAR_SERVERINFO */| CVAR_USERINFO, 0, qtrue, qtrue},
+#endif 
+  {&g_dragonTeam, "g_dragonTeam", DEFAULT_CLAN_DRAGONS, CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO, 0, qtrue, qtrue},
+  {&g_nikkiTeam, "g_nikkiTeam", DEFAULT_CLAN_NIKKIS, CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO, 0, qtrue, qtrue},
 #ifdef USE_GT_SINGLEPLAYER
   {&g_singlePlayer, "ui_singlePlayerActive", "", 0, 0, qfalse, qfalse},
 #endif