diff --git a/source/cl_input.c b/source/cl_input.c
index 4394634..bbae409 100644
--- a/source/cl_input.c
+++ b/source/cl_input.c
@@ -390,7 +390,7 @@ void CL_BaseMove (usercmd_t *cmd)
 
 	Q_memset (cmd, 0, sizeof(*cmd));
 
-	// Moto - we handle movespeed in QC now.
+	// cypress - we handle movespeed in QC now.
 	cl_backspeed = cl_forwardspeed = cl_sidespeed = sv_player->v.maxspeed*0.71;
 
 	// Throttle side and back speeds
diff --git a/source/cl_parse.c b/source/cl_parse.c
index 8216172..2c69ed3 100644
--- a/source/cl_parse.c
+++ b/source/cl_parse.c
@@ -1537,7 +1537,7 @@ void CL_ParseServerMessage (void)
 			
 #else
 
-    MSG_ReadByte(); // motolegacy -- stop breaking protocol
+    MSG_ReadByte(); // cypress -- stop breaking protocol
 
 #endif // VITA
 			
diff --git a/source/gl_draw.c b/source/gl_draw.c
index 06ee759..88038c0 100644
--- a/source/gl_draw.c
+++ b/source/gl_draw.c
@@ -587,7 +587,7 @@ void Draw_CharacterScale (int x, int y, int num, float scale)
 Draw_CharacterRGBA
 
 This is the same as Draw_Character, but with RGBA color codes.
-- MotoLegacy and ported to Quakespasm by sB :)
+- cypress and ported to Quakespasm by sB :)
 ================
 */
 void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a)
@@ -929,7 +929,7 @@ void Draw_SubPic(int x, int y, int width, int height, int start_x, int start_y,
 	glEnd ();
 }
 
-// motolegacy -- ultimate draw function!! probably annihilates gl calls so use wisely lol
+// cypress -- ultimate draw function!! probably annihilates gl calls so use wisely lol
 // TODO: color shifting?
 void Draw_AlphaStretchPic (int x, int y, int width, int height, float alpha, qpic_t *pic)
 {
diff --git a/source/gl_hud.c b/source/gl_hud.c
index 206597e..073fb4e 100644
--- a/source/gl_hud.c
+++ b/source/gl_hud.c
@@ -714,7 +714,7 @@ void HUD_Rounds (void)
 	x_offset = 0;
 	savex = 0;
 
-	// Round and Title text - moto
+	// Round and Title text - cypress
 	// extra creds to scatterbox for some x/y vals
 	// ------------------
 	// First, fade from white to red, ~3s duration
@@ -825,7 +825,7 @@ void HUD_Rounds (void)
 		}
 	}
 	// ------------------
-	// End Round and Title text - moto
+	// End Round and Title text - cypress
 
 	int x_offset2 = 2; //Extra offset for all round images to keep things uniform (may not be neccesary?) -- SPECIFIC TO WHOLE ROUNDS
 	int y_offset = 50; //y_offset -- SPECIFIC TO WHOLE ROUNDS
diff --git a/source/gl_screen.c b/source/gl_screen.c
index 8320324..ee2267f 100644
--- a/source/gl_screen.c
+++ b/source/gl_screen.c
@@ -670,7 +670,7 @@ static void SCR_CalcRefdef (void)
 	r_refdef.vrect.y = (glheight - r_refdef.vrect.height)/2;
 	//johnfitz
 
-	// motolegacy -- hack to enable more standard fov values in quakespasm
+	// cypress -- hack to enable more standard fov values in quakespasm
 	r_refdef.fov_x = AdaptFovx(scr_fov.value - 15, vid.width, vid.height);
 	r_refdef.fov_y = CalcFovy (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height);
 
@@ -1161,7 +1161,7 @@ char *ReturnLoadingtex (void)
 #endif // VITA
             break;
         case 35:
-            return 	"MotoLegacy, or \"Ivy\", is from the USA.";
+            return 	"CypressImplex, or \"Ivy\", is from the USA.";
             break;
         case 36:
             return  "Zombies don't like bullets.";
diff --git a/source/menu.c b/source/menu.c
index 1f3386c..cc4b295 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -3404,17 +3404,17 @@ void M_Credits_Draw (void)
 	DRAW_HEADER("CREDITS");
 
 	DRAW_CREDITLINE(0, "Programming:");
-	DRAW_CREDITLINE(1, "Blubswillrule, Jukki, DR_Mabuse1981, Naievil, MotoLegacy");
+	DRAW_CREDITLINE(1, "Blubswillrule, Jukki, DR_Mabuse1981, Naievil, Cypress");
 	DRAW_CREDITLINE(2, "ScatterBox");
 	DRAW_CREDITLINE(3, "");
 	DRAW_CREDITLINE(4, "Models:");
 	DRAW_CREDITLINE(5, "Blubswillrule, Ju[s]tice, Derped_Crusader");
 	DRAW_CREDITLINE(6, "");
 	DRAW_CREDITLINE(7, "GFX:");
-	DRAW_CREDITLINE(8, "Blubswillrule, Ju[s]tice, MotoLegacy, Derped_Crusader");
+	DRAW_CREDITLINE(8, "Blubswillrule, Ju[s]tice, Cypress, Derped_Crusader");
 	DRAW_CREDITLINE(9, "");
 	DRAW_CREDITLINE(10, "Sounds/Music:");
-	DRAW_CREDITLINE(11, "Blubswillrule, Biodude, MotoLegacy, Marty P.");
+	DRAW_CREDITLINE(11, "Blubswillrule, Biodude, Cypress, Marty P.");
 	DRAW_CREDITLINE(12, "");
 	DRAW_CREDITLINE(13, "Special Thanks:");
 	DRAW_CREDITLINE(14, "- Spike, Eukara:     FTEQW");
diff --git a/source/pr_cmds.c b/source/pr_cmds.c
index 7227cee..ffb5fbe 100644
--- a/source/pr_cmds.c
+++ b/source/pr_cmds.c
@@ -2533,7 +2533,7 @@ Close_Waypoint
 
 void Close_Waypoint (string, string, string, string, string, string, string, string)
 
-moto - basically a carbon copy of open_waypoint lol
+cypress - basically a carbon copy of open_waypoint lol
 =================
 */
 void Close_Waypoint (void)
diff --git a/source/r_alias.c b/source/r_alias.c
index 6b92697..1207782 100644
--- a/source/r_alias.c
+++ b/source/r_alias.c
@@ -706,7 +706,7 @@ void R_SetupAliasLighting (entity_t	*e)
 			lightcolor[2] = 256.0f;
 		}
 
-	// motolegacy -- re-te EF_FULLBRIGHT support
+	// cypress -- re-te EF_FULLBRIGHT support
 	// TODO: potentially just block dlights from colorizing
 	if (e->effects & EF_FULLBRIGHT) {
 		lightcolor[0] = 400.0f;
diff --git a/source/sv_main.c b/source/sv_main.c
index c75aa54..536a5a7 100644
--- a/source/sv_main.c
+++ b/source/sv_main.c
@@ -1196,14 +1196,14 @@ void SV_CreateBaseline (void)
 			svent->baseline.colormap = entnum;
 			svent->baseline.modelindex = SV_ModelIndex("models/player.mdl");
 			svent->baseline.alpha = ENTALPHA_DEFAULT; //johnfitz -- alpha support
-			svent->baseline.light_lev = 0; // motolegacy -- light level support
+			svent->baseline.light_lev = 0; // cypress -- light level support
 		}
 		else
 		{
 			svent->baseline.colormap = 0;
 			svent->baseline.modelindex = SV_ModelIndex(PR_GetString(svent->v.model));
 			svent->baseline.alpha = svent->alpha; //johnfitz -- alpha support
-			svent->baseline.light_lev = 0; // motolegacy -- light level support
+			svent->baseline.light_lev = 0; // cypress -- light level support
 		}
 
 		//johnfitz -- PROTOCOL_FITZQUAKE
diff --git a/source/view.c b/source/view.c
index 72862dd..53dab73 100644
--- a/source/view.c
+++ b/source/view.c
@@ -1068,7 +1068,7 @@ void V_CalcRefdef (void)
 
 	temp_up[0] *= cADSOfs[1];
 	temp_up[1] *= cADSOfs[1];
-	temp_up[2] *= cADSOfs[1]; // motolegacy -- another vmodel hack: standard ADS offsets don't go up enough. sB was cADSOfs[1]
+	temp_up[2] *= cADSOfs[1]; // cypress -- another vmodel hack: standard ADS offsets don't go up enough. sB was cADSOfs[1]
 
 	temp_forward[0] *= cADSOfs[2];
 	temp_forward[1] *= cADSOfs[2];