diff --git a/devel/export-dt-ini.lua b/devel/export-dt-ini.lua
index 63bcff63f8..a38ef74277 100644
--- a/devel/export-dt-ini.lua
+++ b/devel/export-dt-ini.lua
@@ -137,6 +137,8 @@ address('present_simple_verb',df.language_word,'forms','Verb3rdPerson')
 address('past_simple_verb',df.language_word,'forms','VerbPast')
 address('past_participle_verb',df.language_word,'forms','VerbPassive')
 address('present_participle_verb',df.language_word,'forms','VerbGerund')
+address('first_name',df.language_name,'first_name')
+address('nickname',df.language_name,'nickname')
 address('words',df.language_name,'words')
 address('word_type',df.language_name,'parts_of_speech')
 address('language_id',df.language_name,'language')
@@ -289,9 +291,7 @@ address('tissue_name',df.tissue_template,'tissue_name_singular')
 address('tissue_flags',df.tissue_template,'flags')
 
 header('dwarf_offsets')
-address('first_name',df.unit,'name','first_name')
-address('nick_name',df.unit,'name','nickname')
-address('last_name',df.unit,'name','words')
+address('name',df.unit,'name')
 address('custom_profession',df.unit,'custom_profession')
 address('profession',df.unit,'profession')
 address('race',df.unit,'race')