diff --git a/library/modules/Translation.cpp b/library/modules/Translation.cpp
index e05154b44..282039c02 100644
--- a/library/modules/Translation.cpp
+++ b/library/modules/Translation.cpp
@@ -69,16 +69,7 @@ bool Translation::copyName(df::language_name * source, df::language_name * targe
     if (source == target)
         return true;
 
-    target->first_name = source->first_name;
-    target->nickname = source->nickname;
-    for (int i = 0; i < 7; i++)
-    {
-        target->words[i] = source->words[i];
-        target->parts_of_speech[i] = source->parts_of_speech[i];
-    }
-    target->language = source->language;
-    target->unknown = source->unknown;
-    target->has_name = source->has_name;
+    *target = *source;
     return true;
 }
 
diff --git a/library/xml b/library/xml
index ec0f06754..b439f2287 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ec0f06754f0e03655611fe29d388f0a3ffad21e4
+Subproject commit b439f22876634725f246703e3ac8a7a0b1a01d63
diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index e8a1046df..f37400cbb 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -153,7 +153,7 @@ void selectWord (const df::language_word_table &table, int32_t &word, df::part_o
     }
 }
 
-void generateName(df::language_name &output, int language, int mode, const df::language_word_table &table1, const df::language_word_table &table2)
+void generateName(df::language_name &output, int language, df::language_name_type mode, const df::language_word_table &table1, const df::language_word_table &table2)
 {
     for (int i = 0; i < 100; i++)
     {
@@ -162,7 +162,7 @@ void generateName(df::language_name &output, int language, int mode, const df::l
             output = df::language_name();
             if (language == -1)
                 language = rng.df_trandom(world->raws.language.translations.size());
-            output.unknown = mode;
+            output.type = mode;
             output.language = language;
         }
         output.has_name = 1;
@@ -1316,10 +1316,10 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
 
     // Generate the artifact's name
     if (type == mood_type::Fell || type == mood_type::Macabre)
-        generateName(unit->status.artifact_name, unit->name.language, 1, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
+        generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
     else
     {
-        generateName(unit->status.artifact_name, unit->name.language, 1, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
+        generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
         if (!rng.df_trandom(100))
             unit->status.artifact_name = unit->name;
     }