diff --git a/data/text/abilities.ts b/data/text/abilities.ts
index 1c2b115323..087e910623 100644
--- a/data/text/abilities.ts
+++ b/data/text/abilities.ts
@@ -911,7 +911,7 @@ export const AbilitiesText: { [id: IDEntry]: AbilityText } = {
 			desc: "Pokemon making contact with this Pokemon have their Ability changed to Lingering Aroma. Does not affect Pokemon with the As One, Battle Bond, Comatose, Disguise, Gulp Missile, Ice Face, Lingering Aroma, Multitype, Power Construct, RKS System, Schooling, Shields Down, Stance Change, or Zen Mode Abilities.",
 		},
 
-		changeAbility: "  A lingering aroma clings to [TARGET]!",
+		changeAbility: "  A lingering aroma clings to [POKEMON]!",
 	},
 	liquidooze: {
 		name: "Liquid Ooze",
@@ -1106,7 +1106,7 @@ export const AbilitiesText: { [id: IDEntry]: AbilityText } = {
 			desc: "Pokemon making contact with this Pokemon have their Ability changed to Mummy. Does not affect Pokemon with the Multitype or Mummy Abilities.",
 		},
 
-		changeAbility: "  [TARGET]'s Ability became Mummy!",
+		changeAbility: "  [POKEMON]'s Ability became Mummy!",
 	},
 	myceliummight: {
 		name: "Mycelium Might",
diff --git a/sim/pokemon.ts b/sim/pokemon.ts
index b9283feb3a..105865cc6b 100644
--- a/sim/pokemon.ts
+++ b/sim/pokemon.ts
@@ -1924,18 +1924,13 @@ export class Pokemon {
 		this.ability = ability.id;
 		this.abilityState = this.battle.initEffectState({ id: ability.id, target: this });
 		if (sourceEffect && !isFromFormeChange && !isTransform) {
-			switch (sourceEffect.id) {
-			case 'mummy':
-			case 'lingeringaroma':
-				this.battle.add('-activate', source, sourceEffect.fullname, this, '[ability] ' + oldAbility.name);
-				break;
-			default:
-				if (source) {
-					this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`, `[of] ${source}`);
-				} else {
-					this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`);
-				}
-				break;
+			if (sourceEffect.effectType === 'Ability' && this !== this.battle.effectState.target) {
+				this.battle.add('-activate', source, sourceEffect.fullname);
+			}
+			if (source) {
+				this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`, `[of] ${source}`);
+			} else {
+				this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`);
 			}
 		}
 		if (ability.id && this.battle.gen > 3 &&