4 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 5815a913d3b..1d9518f657e 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -368,7 +368,7 @@ typedef enum ID_Type {
 	ID_TE   = MAKE_ID2('T', 'E'), /* Tex (Texture) */
 	ID_IM   = MAKE_ID2('I', 'M'), /* Image */
 	ID_LT   = MAKE_ID2('L', 'T'), /* Lattice */
-	ID_LA   = MAKE_ID2('L', 'A'), /* Lamp */
+	ID_LA   = MAKE_ID2('L', 'A'), /* Light */
 	ID_CA   = MAKE_ID2('C', 'A'), /* Camera */
 	ID_IP   = MAKE_ID2('I', 'P'), /* Ipo (depreciated, replaced by FCurves) */
 	ID_KE   = MAKE_ID2('K', 'E'), /* Key (shape key) */
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 2cfd612d6cc..2940171f5e1 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -325,7 +325,7 @@ typedef struct Ipo {
 #define WO_STARDIST	15
 #define WO_STARSIZE	16
 
-/* ********** Lamp (ID_LA) ********** */
+/* ********** Light (ID_LA) ********** */
 
 #define LA_TOTIPO	21
 #define LA_TOTNAM	10
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index e1efc0a04f2..c220b377a0e 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -37,7 +37,7 @@ struct Ipo;
 struct MTex;
 struct bNodeTree;
 
-typedef struct Lamp {
+typedef struct Light {
 	ID id;
 	/** Animation data (must be immediately after id for utilities to use it). */
 	struct AnimData *adt;
@@ -88,7 +88,7 @@ typedef struct Lamp {
 
 	/* nodes */
 	struct bNodeTree *nodetree;
-} Lamp;
+} Light;
 
 /* **************** LAMP ********************* */
 
diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h
index c492839f4fc..6c3b65ee861 100644
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@ -51,6 +51,7 @@
 
 /* Match RNA names where possible, keep sorted. */
 
+DNA_STRUCT_RENAME(Lamp, Light)
 DNA_STRUCT_RENAME(SpaceButs, SpaceProperties)
 DNA_STRUCT_RENAME(SpaceIpo, SpaceGraph)
 DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner)
@@ -86,5 +87,5 @@ DNA_STRUCT_RENAME_ELEM(bTheme, tuserpref, space_preferences)
 DNA_STRUCT_RENAME_ELEM(bTheme, tv3d, space_view3d)
 
 #if 0
-DNA_STRUCT_RENAME(Lamp, Light)
+DNA_STRUCT_RENAME(Light, Light)
 #endif