diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 349e9a4cd..edfed4e1c 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 
 OPTION(BUILD_DWARFEXPORT "Build dwarf exporter." ON)
 if (BUILD_DWARFEXPORT)
-    add_subdirectory (export)
+    add_subdirectory (dwarfexport)
 endif()
 
 DFHACK_PLUGIN(reveal reveal.cpp)
diff --git a/plugins/export/CMakeLists.txt b/plugins/dwarfexport/CMakeLists.txt
similarity index 85%
rename from plugins/export/CMakeLists.txt
rename to plugins/dwarfexport/CMakeLists.txt
index 1ff69fb27..cd4a647b8 100644
--- a/plugins/export/CMakeLists.txt
+++ b/plugins/dwarfexport/CMakeLists.txt
@@ -1,11 +1,11 @@
 PROJECT (export)
 # A list of source files
 SET(PROJECT_SRCS
-    export.cpp
+    dwarfexport.cpp
 )
 # A list of headers
 SET(PROJECT_HDRS
-    export.h
+    dwarfexport.h
 )
 SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
@@ -28,4 +28,4 @@ ELSE(UNIX)
     )
 ENDIF(UNIX)
 # this makes sure all the stuff is put in proper places and linked to dfhack
-DFHACK_PLUGIN(export ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
+DFHACK_PLUGIN(dwarfexport ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
diff --git a/plugins/export/export.cpp b/plugins/dwarfexport/dwarfexport.cpp
similarity index 96%
rename from plugins/export/export.cpp
rename to plugins/dwarfexport/dwarfexport.cpp
index 4915e34c8..3dfd3f88f 100644
--- a/plugins/export/export.cpp
+++ b/plugins/dwarfexport/dwarfexport.cpp
@@ -27,7 +27,7 @@ using df::global::ui;
 using df::global::world;
 
 // our own, empty header.
-#include "export.h"
+#include "dwarfexport.h"
 
 
 // Here go all the command declarations...
@@ -37,7 +37,7 @@ DFhackCExport command_result export_dwarves (Core * c, std::vector <std::string>
 // A plugins must be able to return its name. This must correspond to the filename - export.plug.so or export.plug.dll
 DFhackCExport const char * plugin_name ( void )
 {
-    return "export";
+    return "dwarfexport";
 }
 
 // Mandatory init function. If you have some global state, create it here.
@@ -45,7 +45,7 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector <PluginCommand>
 {
     // Fill the command list with your commands.
     commands.clear();
-    commands.push_back(PluginCommand("export",
+    commands.push_back(PluginCommand("dwarfexport",
                                      "Export dwarves to RuneSmith-compatible XML.",
                                      export_dwarves /*,
                                      true or false - true means that the command can't be used from non-interactive user interface'*/));
@@ -58,7 +58,7 @@ DFhackCExport command_result plugin_shutdown ( Core * c )
     return CR_OK;
 }
 
-static char* physicals[] = {
+static const char* physicals[] = {
     "Strength",
     "Agility",
     "Toughness",
@@ -67,7 +67,7 @@ static char* physicals[] = {
     "DiseaseResistance",
 };
 
-static char* mentals[] = {
+static const char* mentals[] = {
     "Willpower",
     "Memory",
     "Focus",
diff --git a/plugins/export/export.h b/plugins/dwarfexport/dwarfexport.h
similarity index 100%
rename from plugins/export/export.h
rename to plugins/dwarfexport/dwarfexport.h