diff --git a/lib/gamedata/activation.txt b/lib/gamedata/activation.txt
index f623b8678c..f010a43937 100644
--- a/lib/gamedata/activation.txt
+++ b/lib/gamedata/activation.txt
@@ -313,9 +313,9 @@ desc:cures blindness and gives you telepathy for 9d9+24 turns
 name:ENLIGHTENMENT
 aim:0
 power:22
-effect:ENLIGHTENMENT
+effect:LIGHT_LEVEL
 dice:1
-desc:completely lights up and magically maps the level
+desc:completely lights up and magically maps the level, detecting all objects
 
 
 name:HERO
@@ -685,18 +685,12 @@ param:3
 dice:2d15
 desc:lights up the surrounding area, hurting light-sensitive creatures
 
-#name:CLAIRVOYANCE
-#aim:0
-#power:23
-#msg:The {kind} form{s} an image in your mind...
-#effect:ENLIGHTENMENT
-#effect:DETECT_TRAPS
-#dice:22d40
-#effect:DETECT_DOORS
-#dice:22d40
-#effect:DETECT_STAIRS
-#dice:22d40
-#desc:maps the entire level and detects nearby objects, traps, doors, and stairs
+name:CLAIRVOYANCE
+aim:0
+power:23
+msg:The {kind} form{s} an image in your mind...
+effect:LIGHT_LEVEL
+desc:lights and maps the entire level, sensing objects
 
 name:PROBING
 aim:0
diff --git a/lib/gamedata/artifact.txt b/lib/gamedata/artifact.txt
index 93c918d6d2..9cbf879e4b 100644
--- a/lib/gamedata/artifact.txt
+++ b/lib/gamedata/artifact.txt
@@ -119,9 +119,7 @@ alloc:2:50 to 127
 power:0:1d1:0:0:0
 flags:SEE_INVIS | HOLD_LIFE | NO_FUEL
 values:LIGHT[3] | RES_LIGHT[1] | RES_DARK[1]
-#E:DETECT_ALL:30+d30
-#act:CLAIRVOYANCE
-act:ENLIGHTENMENT
+act:CLAIRVOYANCE
 time:50+d50
 desc:A great globe seemingly filled with moonlight, the famed Heart of the 
 desc:Mountain.  It splinters the light that falls upon it into ten thousand 
diff --git a/lib/gamedata/class.txt b/lib/gamedata/class.txt
index 30ef95c25a..d8ea5f2178 100644
--- a/lib/gamedata/class.txt
+++ b/lib/gamedata/class.txt
@@ -949,8 +949,8 @@ desc: current hit points of the monster and many of its characteristics
 desc: and abilities (excluding its melee, spellcasting, and breath attacks).
 
 spell:Clairvoyance:35:50:80:230
-effect:ENLIGHTENMENT
-desc:Lights up, maps out, and detects all objects on the complete current
+effect:LIGHT_LEVEL
+desc:Lights up, maps out, and senses all objects on the complete current
 desc: dungeon level.
 
 book:prayer book:[Purifications and Healing]:5:2
diff --git a/lib/gamedata/object.txt b/lib/gamedata/object.txt
index 705ff73e42..9d8bb46d35 100644
--- a/lib/gamedata/object.txt
+++ b/lib/gamedata/object.txt
@@ -2421,8 +2421,7 @@ properties:25:4:800
 alloc:40:25 to 100
 pile:25:2
 power:22
-effect:ENLIGHTENMENT
-dice:1
+effect:LIGHT_LEVEL
 
 name:*Enlightenment*
 type:potion
@@ -2431,7 +2430,7 @@ properties:70:4:12000
 alloc:8:70 to 100
 combat:0:1d1:0:0:0
 power:20000
-effect:ENLIGHTENMENT
+effect:LIGHT_LEVEL
 dice:1
 effect:RESTORE_STAT:INT
 effect:GAIN_STAT:INT
diff --git a/src/effects.c b/src/effects.c
index fcee28d639..82464a66c2 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -3319,7 +3319,7 @@ bool effect_handler_EARTHQUAKE(effect_handler_context_t *context)
 	return true;
 }
 
-bool effect_handler_ENLIGHTENMENT(effect_handler_context_t *context)
+bool effect_handler_LIGHT_LEVEL(effect_handler_context_t *context)
 {
 	bool full = context->value.base ? true : false;
 	if (full)
diff --git a/src/list-effects.h b/src/list-effects.h
index d042a462b1..9e682d0bdd 100644
--- a/src/list-effects.h
+++ b/src/list-effects.h
@@ -71,7 +71,7 @@ EFFECT(TELEPORT_LEVEL,				false,	NULL,		0,		EFINFO_NONE,	"teleports you one leve
 EFFECT(RUBBLE,						false,	NULL,		0,		EFINFO_NONE,	"causes rubble to fall around you")
 EFFECT(DESTRUCTION,					false,	NULL,		1,		EFINFO_QUAKE,	"destroys an area around you in the shape of a circle radius %d, and blinds you for 1d10+10 turns")
 EFFECT(EARTHQUAKE,					false,	NULL,		1,		EFINFO_QUAKE,	"causes an earthquake around you of radius %d")
-EFFECT(ENLIGHTENMENT,				false,	NULL,		0,		EFINFO_NONE,	"completely lights up and magically maps the level")
+EFFECT(LIGHT_LEVEL,					false,	NULL,		0,		EFINFO_NONE,	"completely lights up and magically maps the level")
 EFFECT(LIGHT_AREA,					false,	NULL,		2,		EFINFO_LIGHT,	"lights up the surrounding area, causing %s damage to light-sensitive creatures within %d grids")
 EFFECT(DARKEN_AREA,					false,	NULL,		0,		EFINFO_NONE,	"darkens the surrounding area")
 EFFECT(SPOT,						false,	"dam",		3,		EFINFO_BALL,	"fires a ball of %s with radius %d, dealing %s damage at the centre")