diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx
index a105dd04..8af646a4 100644
--- a/src/MarbleWorld.hx
+++ b/src/MarbleWorld.hx
@@ -2118,7 +2118,7 @@ class MarbleWorld extends Scheduler {
 
 		if (this.gemCount < this.totalGems) {
 			AudioManager.playSound(ResourceLoader.getResource('data/sound/missinggems.wav', ResourceLoader.getAudio, this.soundResources));
-			displayAlert("You can't finish without all the diamonds!!");
+			displayAlert("You can't finish without all the gems!!");
 		} else {
 			this.endPad.spawnFirework(this.timeState);
 			this.finishTime = this.timeState.clone();
diff --git a/src/modes/NullMode.hx b/src/modes/NullMode.hx
index 003cd4c6..f1155d5a 100644
--- a/src/modes/NullMode.hx
+++ b/src/modes/NullMode.hx
@@ -85,7 +85,7 @@ class NullMode implements GameMode {
 
 		// Show a notification (and play a sound) based on the gems remaining
 		if (this.level.gemCount == this.level.totalGems) {
-			string = "You have all the diamonds, head for the finish!";
+			string = "You have all the gems, head for the finish!";
 			// if (!this.rewinding)
 			AudioManager.playSound(ResourceLoader.getResource('data/sound/gotallgems.wav', ResourceLoader.getAudio, @:privateAccess this.level.soundResources));
 
@@ -96,13 +96,13 @@ class NullMode implements GameMode {
 			// 	this.touchFinish(completionOfImpact);
 			// }
 		} else {
-			string = "You picked up a diamond.  ";
+			string = "You picked up a gem. ";
 
 			var remaining = this.level.totalGems - this.level.gemCount;
 			if (remaining == 1) {
-				string += "Only one diamond to go!";
+				string += "Only one gem to go!";
 			} else {
-				string += '${remaining} diamonds to go!';
+				string += '${remaining} gems to go!';
 			}
 
 			// if (!this.rewinding)
diff --git a/src/shapes/Helicopter.hx b/src/shapes/Helicopter.hx
index 0efc5595..80eb39f0 100644
--- a/src/shapes/Helicopter.hx
+++ b/src/shapes/Helicopter.hx
@@ -16,7 +16,7 @@ class Helicopter extends PowerUp {
 		this.isTSStatic = false;
 		this.showSequences = false;
 		this.identifier = "Helicopter";
-		this.pickUpName = "Helicopter PowerUp";
+		this.pickUpName = "Gyrocopter PowerUp";
 	}
 
 	public override function init(level:MarbleWorld, onFinish:Void->Void) {
diff --git a/src/shapes/ShockAbsorber.hx b/src/shapes/ShockAbsorber.hx
index 61253e63..a3de971e 100644
--- a/src/shapes/ShockAbsorber.hx
+++ b/src/shapes/ShockAbsorber.hx
@@ -13,7 +13,7 @@ class ShockAbsorber extends PowerUp {
 		this.isCollideable = false;
 		this.isTSStatic = false;
 		this.identifier = "ShockAbsorber";
-		this.pickUpName = "Anti-Recoil PowerUp";
+		this.pickUpName = "Shock Absorber PowerUp";
 	}
 
 	public override function init(level:MarbleWorld, onFinish:Void->Void) {
diff --git a/src/shapes/SuperBounce.hx b/src/shapes/SuperBounce.hx
index c814e2e3..b35b62ea 100644
--- a/src/shapes/SuperBounce.hx
+++ b/src/shapes/SuperBounce.hx
@@ -13,7 +13,7 @@ class SuperBounce extends PowerUp {
 		this.isCollideable = false;
 		this.isTSStatic = false;
 		this.identifier = "SuperBounce";
-		this.pickUpName = "Marble Recoil PowerUp";
+		this.pickUpName = "Super Bounce PowerUp";
 	}
 
 	public function pickUp(marble:src.Marble):Bool {
diff --git a/src/shapes/SuperJump.hx b/src/shapes/SuperJump.hx
index 1a89fc19..21b4fe88 100644
--- a/src/shapes/SuperJump.hx
+++ b/src/shapes/SuperJump.hx
@@ -42,7 +42,7 @@ class SuperJump extends PowerUp {
 		this.isCollideable = false;
 		this.isTSStatic = false;
 		this.identifier = "SuperJump";
-		this.pickUpName = "Jump Boost PowerUp";
+		this.pickUpName = "Super Jump PowerUp";
 		sjEmitterParticleData = new ParticleData();
 		sjEmitterParticleData.identifier = "superJumpParticle";
 		sjEmitterParticleData.texture = ResourceLoader.getResource("data/particles/twirl.png", ResourceLoader.getTexture, this.textureResources);
diff --git a/src/shapes/SuperSpeed.hx b/src/shapes/SuperSpeed.hx
index 76de19ab..43eb9c52 100644
--- a/src/shapes/SuperSpeed.hx
+++ b/src/shapes/SuperSpeed.hx
@@ -47,7 +47,7 @@ class SuperSpeed extends PowerUp {
 		this.isCollideable = false;
 		this.isTSStatic = false;
 		this.identifier = "SuperSpeed";
-		this.pickUpName = "Speed Booster PowerUp";
+		this.pickUpName = "Super Speed PowerUp";
 		this.useInstancing = true;
 		ssEmitterParticleData = new ParticleData();
 		ssEmitterParticleData.identifier = "superSpeedParticle";